From nobody Fri Aug 09 16:22:04 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WgThD5xZyz5SM3h; Fri, 09 Aug 2024 16:22:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WgThD5TJlz4sX6; Fri, 9 Aug 2024 16:22:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723220524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=de3NMjNZ3Z8uzZb2gMjm4BX05ugoJ/Np9VVLIZY9Evg=; b=SmViPlCCsi2yMEwRPnbI/JSrEhAHBC2Mr3YjdgTUbGoIzKEnw4FsI10sPyI4wjCVzy7Wsn 3jNSXE0ArPCSljpLNVE/dEr8iFUqAtSR1oGTkfQM0cZKlnpge+j0vbbRJX3thywykC1ZmL S5nUjfMX801cJsBroRj9xv0jVSeiT4auQuV+zFjSNVtzG74XW/3ovj4HGGIly4Bawc0LLL gFWqsdGfly62sCH+DPJCU2HnUC5SIYF1FEDP6Zd/1yvzeUZxzDoT58587JVuStdlQ2Z+80 Z7PcutqTuuCCegXKuSpWldXojuXjXlkb8QvbZoK7rmzRL3jWnWoRFQ2eohlY1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723220524; a=rsa-sha256; cv=none; b=rgkCsknv33ywwv+/bTxZlLH4H5vfNxVAN45i3PScboRsUrjxFTs/GsXwE2Rir4shZhg1ZO SKw4lAzUak34P5lxWJcxbj9vFTvPmDoujxBvtr+6RXzXWL9zpytXgr3WjBDxU+SEVGBjYh hqwcO2UrwPREfuwYvW0RXt3Ptno96Dql/w2dUCQMX7SOedJHe8vJEUf575mQKiwxU8q5AA Gqw5Pashell6/eJUVGNP/fqDlcByZjU0GOrnymBvcOmQuMKLmSSD1DPbEMfPS/+5W9jEvV joTRka8zL+xxx+I1TfMmKQOumQUyQWHx0rFmNiX1sJy9gGPOTbW6AtVQZwNcKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723220524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=de3NMjNZ3Z8uzZb2gMjm4BX05ugoJ/Np9VVLIZY9Evg=; b=vNsWykm+uRCGR6G94EVVWhKwIekM/bFp6Ag+OrzrgzhIA2GJ2sPGgxSjIk+iQaPcCU9Eiq MlB0uJL1f4voUmCf1hgANJJ4NEC2OrxfkpMYhKO14f05iZGkhXLy7k4SmFfqx6JH0xn+OK qZ/QCiGf3ZXsSDOQbQDmbtJNg6Z8srM0lJLsb8t5KwXNspitPxbFUPt25tLoLqZiAxqFlh yQxZAVIgsGPHZcwtk6BcyKylMB1NA7RIM/WbdeIUGhDrp30TkzNTj9mNGllRbPoG67RS/W nRhSpcoyJmzc+W/SxsJTZ2FxD0w6LZE037ONo88x7aLmVW2/oY5rGHWRIdCtnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WgThD54m3zP3f; Fri, 9 Aug 2024 16:22:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 479GM4k4081218; Fri, 9 Aug 2024 16:22:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 479GM4O3081215; Fri, 9 Aug 2024 16:22:04 GMT (envelope-from git) Date: Fri, 9 Aug 2024 16:22:04 GMT Message-Id: <202408091622.479GM4O3081215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: d349bd35330d - main - shutdown: fix option sorting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d349bd35330d3ec7ce1d3e7d6c2d6fc1f6a95704 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d349bd35330d3ec7ce1d3e7d6c2d6fc1f6a95704 commit d349bd35330d3ec7ce1d3e7d6c2d6fc1f6a95704 Author: Kyle Evans AuthorDate: 2024-08-09 16:21:00 +0000 Commit: Kyle Evans CommitDate: 2024-08-09 16:21:00 +0000 shutdown: fix option sorting A last minute change moved this from -W to -q; fix the sorting in a few places to reflect that. Fixes: 6c7ec630c24 ("shutdown: add a -q(uiet) flag to suppress [...]") Sponsored by: Klara, Inc. --- sbin/shutdown/shutdown.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c index 101e003b44e2..e92d41220a20 100644 --- a/sbin/shutdown/shutdown.c +++ b/sbin/shutdown/shutdown.c @@ -133,7 +133,7 @@ main(int argc, char **argv) goto poweroff; } - while ((ch = getopt(argc, argv, "-chknoprq")) != -1) + while ((ch = getopt(argc, argv, "-chknopqr")) != -1) switch (ch) { case '-': readstdin = 1; @@ -156,12 +156,12 @@ main(int argc, char **argv) case 'p': dopower = 1; break; - case 'r': - doreboot = 1; - break; case 'q': dowarn = false; break; + case 'r': + doreboot = 1; + break; case '?': default: usage((char *)NULL);