From nobody Fri Dec 19 23:27:13 2025 X-Original-To: dev-commits-src-all@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 4dY3bP3HqFz6KqdH for ; Fri, 19 Dec 2025 23:27:13 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dY3bP2n2Nz3jxk for ; Fri, 19 Dec 2025 23:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766186833; 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=qCjHdqcXfiXzga1J1Tz1H4lTaBMcvGkG4hjjNguJnSI=; b=jfucA64CyLn0QHW2+jZjxbJmviPpJ0tPPI7COPYqfUwA776SHJcks61jk/DNBjsTSRnx/O StGS/3av30M4Jv9vonUTTy1e3o7RT7aaFvbNQ4Z7rbDvsZ6eOAsL220v8qZUIBVeXD6dkq sGLtPwa58UqXRyJBhlARQ9uGEEctQySCfJwXPRjvxK/vX0gP0PQKDVOdalqACHnW943PPQ rWAAQvokzE1IBItkDsWz3CyIjO21UlHPhbnXt8trgQ+V4vd8E0/OSX04fNEog5b3G7VZs9 dZlfEODBFtkr4v6vJ6FV4I3v+mC4AW7Oth8MnJWe8yt7+k2lOqPdBDLHlpfWfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766186833; 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=qCjHdqcXfiXzga1J1Tz1H4lTaBMcvGkG4hjjNguJnSI=; b=N8qBt/H8Nz4at2AB7m+6f7it8E3ArWDC6bgxJdWnrMGD8lE5W2dUvw96YNUmnChx2RB2ej VO6V46e355I4yZEfFr31wuMvkh6IL5If8/MLAUyv6dI24Ay3NkI50w6rxlPvCVGtYMeZx3 oxH9I6l6uNqFjZW1HOzh0jyKqparlJaxiSLbShWbCArpy6H6k34WFUgBM5oNu/qh49imPe eJ44yzrJgfRBgwZfOHXp94KqI+NMy/dZ7kygOL+Q41FVu9jZAsOAnoAQAOa68vzynK+eDl SICEyjZzAjJJyG/SM7JKGLBSOlzv8KKowwEb4rhb94h2zlwbblks0MtrNYHkzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766186833; a=rsa-sha256; cv=none; b=waLwqwgGD4FLopc1cVvA1rpyMHuVdWjqoXuW7jafMf5f4qclWBoHGAR7v9FRxGF2Lc8XcI 07A55JS8MJ+Pxx6a8d34UHFbiMPaeY+lOHjgCuNtsyyg6kbYllnJvKUREKmNm4eKlmyevW 3FqUYdOV9Fj9Wvh01yBsE6aQB7mkRaOVYisl9CtswTADiYaUiWK3uH+zcl/+YgKZkbIQfz QLek42M/0RniIxJIjDJKHMCNHMdGmTTqu1rRhQbk3dkqHsgAxty77RciuZbdJjI9r2pKBr SYHaYSGFKdF5GyebYIMbF94QZbNvNzieGjw0gswuFnENKyyB3E2mRx4OvHREHw== 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 4dY3bP2CKPzCwZ for ; Fri, 19 Dec 2025 23:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22b37 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 23:27:13 +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: 7f39d05b67ae - main - reboot: Fix halt -p behavior List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 7f39d05b67aec8b87fbad8d5b6381084f99120ec Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 23:27:13 +0000 Message-Id: <6945df51.22b37.32a1af3d@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7f39d05b67aec8b87fbad8d5b6381084f99120ec commit 7f39d05b67aec8b87fbad8d5b6381084f99120ec Author: Dag-Erling Smørgrav AuthorDate: 2025-12-19 23:26:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-19 23:26:37 +0000 reboot: Fix halt -p behavior The RB_HALT bit is always set when invoked as `halt`, so to maintain a distinction between `halt` and `halt -p`, we must check the RB_POWEROFF bit first. PR: 291814 Fixes: 4453ec5b8716 ("reboot: Default to a clean shutdown") Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54320 --- sbin/reboot/reboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index a147b7e08a95..002a393000eb 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -235,9 +235,9 @@ shutdown(int howto) { char sigstr[SIG2STR_MAX]; int signo = - howto & RB_HALT ? SIGUSR1 : - howto & RB_POWEROFF ? SIGUSR2 : howto & RB_POWERCYCLE ? SIGWINCH : + howto & RB_POWEROFF ? SIGUSR2 : + howto & RB_HALT ? SIGUSR1 : howto & RB_REROOT ? SIGEMT : SIGINT;