From nobody Wed Dec 10 14:46:56 2025 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 4dRJTF4WDpz6KgQt for ; Wed, 10 Dec 2025 14:46:57 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dRJTD6WBMz3Jms for ; Wed, 10 Dec 2025 14:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765378017; 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=eKfL7f6jHWtLxMCv3ZXXqiLNiJGd7xqnuMrLPeiPgD0=; b=A7uor2hmDm/MLJ9uDHT+5NOPH2BygFptc7jtdNn0PRA8LSEYm9qEEGSV8Jbsxri6rUnKo0 0A+bNzD/tYv5yQebfiGl0eCedHqabrGx3vVM74pbNmJAqXEwDnoYnZnGHKjJlg9cIwYWTO sYc3ymM96J8TqyrXu75VcAVDz1MUrj6yht66RtNO+R2G7Q4dFKucsEbZDxtclNL0x9rjr2 CPm0SO8324R0CuzKmbgAAcr3BoIHn4KBc0PJ6czVbPvcHM7mqzHnpByiAaf2wqAXwj7gU7 yoMGxybpkhc9XiHWiS0lpnBWg4PO4qxggqwJ7letYe5jKVrfsNBr/eqtMNLs2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765378017; 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=eKfL7f6jHWtLxMCv3ZXXqiLNiJGd7xqnuMrLPeiPgD0=; b=a6EOsc2w35MWwBE2wr3GnRZ8zq1AXEOlNhL5dAiuCACGxCy3A8CxM4FE0cctA0SC8jliQU 0wYI+ivLTvWHJRcTJxsnKMZC7frcVgGZ3Ssnl3NLoz+ObwLWRoKPL1xguNLFer2Nv7Pp2C ntUCTQLvV/7nu5uSeYgw1l2FRk5wE6bVd3rRdytDbKqIsu7F5GgsbbQ6BBP+iZi5+4lNr1 3wWh7FJ7KVoM3WTH0tdUMi6mqYCTXtRdCe/9JdRAcEeiZf63Tk38DQN/VPQ5RNvM0TWEDo e0aE3OZfwTOzzAJKMffreCDo3hEVvYyjuliIRCaMvuIB0+whUg+atpv4OVCzFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765378017; a=rsa-sha256; cv=none; b=Uu8x7vU+sRRXta/b5dYUrGJDIcRj+LQWeysSRm0RH3Sbb+KJMLMgm2q/6+2weEjivGt+91 fbE6EaSEaW3f0ejXCHQmpf4gRKVhKJAOpQ5f/QN00BiGMgY5YsERljJQXsqnSKLq+GA8TA 3q3CpyTK+u0jKXmm/9paPQQcaM9c6actw2475HWVw67UkP9orxoxrj2zZZNwMA6Kv/SN2d OAOXjlAsuNEjg3nYUZikKkMxso7eocAqmyzfJxjVh5kDCk+CU+LDbXgSUp4xo2HpaQ4wuq OxEhGOpXlwxpkZ2PmCfLtxeFEi8P8hk8RpPbKYYd3X65M+A2MaNHHvK6/ulGBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dRJTD5xhxzpvv for ; Wed, 10 Dec 2025 14:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 319e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Dec 2025 14:46:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2a3b1641756a - main - shutdown: Adapt to changes in reboot 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a3b1641756a4f0c50338a17e310f8a2dbd31b50 Auto-Submitted: auto-generated Date: Wed, 10 Dec 2025 14:46:56 +0000 Message-Id: <693987e0.319e5.207ff37c@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2a3b1641756a4f0c50338a17e310f8a2dbd31b50 commit 2a3b1641756a4f0c50338a17e310f8a2dbd31b50 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-10 14:46:08 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-10 14:46:08 +0000 shutdown: Adapt to changes in reboot Now that halt and reboot actually signal init, shutdown needs to run fasthalt or fastboot instead when given the -o option. MFC after: 1 month Reviewed by: imp, allanjude Differential Revision: https://reviews.freebsd.org/D54122 --- sbin/shutdown/shutdown.8 | 8 ++++---- sbin/shutdown/shutdown.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8 index 2f09f5d524a9..81ce2a045859 100644 --- a/sbin/shutdown/shutdown.8 +++ b/sbin/shutdown/shutdown.8 @@ -105,9 +105,9 @@ or options is specified, .Nm will execute -.Xr halt 8 +.Xr fasthalt 8 or -.Xr reboot 8 +.Xr fastboot 8 instead of sending a signal to .Xr init 8 . .It Fl n @@ -116,9 +116,9 @@ If the option is specified, prevent the file system cache from being flushed by passing .Fl n to -.Xr halt 8 +.Xr fasthalt 8 or -.Xr reboot 8 . +.Xr fastboot 8 . This option should probably not be used. .It Fl q Shut down quietly. diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c index 762b23ab6bd9..0fb39530b463 100644 --- a/sbin/shutdown/shutdown.c +++ b/sbin/shutdown/shutdown.c @@ -407,7 +407,7 @@ die_you_gravy_sucking_pig_dog(void) } else { if (doreboot) { BOOTTRACE("exec reboot(8) -l..."); - execle(_PATH_REBOOT, "reboot", "-l", nosync, + execle(_PATH_REBOOT, "fastboot", "-l", nosync, (char *)NULL, empty_environ); syslog(LOG_ERR, "shutdown: can't exec %s: %m.", _PATH_REBOOT); @@ -415,7 +415,7 @@ die_you_gravy_sucking_pig_dog(void) } else if (dohalt) { BOOTTRACE("exec halt(8) -l..."); - execle(_PATH_HALT, "halt", "-l", nosync, + execle(_PATH_HALT, "fasthalt", "-l", nosync, (char *)NULL, empty_environ); syslog(LOG_ERR, "shutdown: can't exec %s: %m.", _PATH_HALT); @@ -423,14 +423,14 @@ die_you_gravy_sucking_pig_dog(void) } else if (dopower) { BOOTTRACE("exec halt(8) -l -p..."); - execle(_PATH_HALT, "halt", "-l", "-p", nosync, + execle(_PATH_HALT, "fasthalt", "-l", "-p", nosync, (char *)NULL, empty_environ); syslog(LOG_ERR, "shutdown: can't exec %s: %m.", _PATH_HALT); warn(_PATH_HALT); } else if (docycle) { - execle(_PATH_HALT, "halt", "-l", "-c", nosync, + execle(_PATH_HALT, "fasthalt", "-l", "-c", nosync, (char *)NULL, empty_environ); syslog(LOG_ERR, "shutdown: can't exec %s: %m.", _PATH_HALT);