From nobody Mon Feb 12 18:53:47 2024 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 4TYYWv6RCtz5BMg9; Mon, 12 Feb 2024 18:53:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYYWv5lKTz4mm1; Mon, 12 Feb 2024 18:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764027; 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=38F8gFgD23oDutwwlmI8hqYZyIpclI2DuaMtPFJ97yc=; b=ek+Oq01pCnbmRNNIcK4ytwcphjAtmwfCMvVzvTQfSxnWxol5WhGZgbjKEBh9zGHTNgP2Yj Xg9+6zLKFhNCer4Zpugh8jpRrfDTGE0L78nsz17Cd64JCUM5kwVbE/9fgoDYqvPq72Om33 EiDifCjzSUOtGrknfyoU58LgTe4GlLNqijSMexbm7qbRTGnWwisF//7k2ZUN0LNqu235Rg YyrMaJvDnugvLVvaxbuTfqxJlInNFYj83inPW2f3PjQNqTC9F2e5zChtHu8C/qwuHsNnXN BNjwPE3De/qMI33IfnRQDnkh8owxqJdlxv5cKXEE4GxmwerDQ1XG8qIxwbXewQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764027; a=rsa-sha256; cv=none; b=yPdPFY1I/v2OrovdAPwhJohhx79XLBYAhVlJG3wSgsEyxNzmcwWtMkSA22veM4p3kpAFOX JnEsxeG8V+XzmP4dRf42hwydCbHEdKkL9K3lOHcLKien2rGRC9IcMXJjWcgbwSbNCKFL98 7CwhcY1hU+DJe7r2FxbyXY6jqd5bRNW62kcPs57POfJ83QT+xURTOLOUivl6AxalXE1Ql3 iHoC+GJbdxHG8koonZAYcjeO4+GyeEOv1P0M5/fFTe5Zgh0W94CcfAQCHvHNu+3z25SSxk l2/8ujz5v4kZ7J6H54Yz/ECJCRqrdMxYcVHN0Hkj3Xrl15py58o2iJ2Krxw3fA== 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=1707764027; 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=38F8gFgD23oDutwwlmI8hqYZyIpclI2DuaMtPFJ97yc=; b=VjjJcWHaJOAfJ75rKzEFA1Ef2AgJuRn7i0zDsMGSRxaf2gndlIDL4Gmn0DCcg3cz8yXx1x skHFYJ4jHZ+urk8fJZhWqS1epZ7qVpA/0nlidSqMOxOdqkAMfjndOZOf2ieCZQscGi3GvR t8OqvUV//nzSpFKpvGmdRLrrNnWF7IMR8+0kO8wSBUr1teYxquAh0C+webTpowciST4ddq sSO0AEbpLo+zvWDbJ/yL14vAj9wbWMCjjJ01Vw2vNtpCwYkaI9jNx6rrS4gmFJDMsMzTSM 8yYItl9LukVne9/0gZKCJFWcoRE30z7RIRZqFMz+/k+1/wVOfAz9MMZ5UUZ4lw== 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 4TYYWv4nyWzk2J; Mon, 12 Feb 2024 18:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CIrlZW030874; Mon, 12 Feb 2024 18:53:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIrlYC030871; Mon, 12 Feb 2024 18:53:47 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:47 GMT Message-Id: <202402121853.41CIrlYC030871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fd6d47375a78 - main - rescue,nextboot: Install nextboot as a link to reboot, rm nextboot.sh 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd6d47375a78fbf0737012b7cc11180291781e8b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd6d47375a78fbf0737012b7cc11180291781e8b commit fd6d47375a78fbf0737012b7cc11180291781e8b Author: Warner Losh AuthorDate: 2024-02-12 18:46:20 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:46:20 +0000 rescue,nextboot: Install nextboot as a link to reboot, rm nextboot.sh Reboot now emulates the nextboot shell script completely. Retire the nextboot.sh script and install the link. Retain the same manual page, since there's enough differences between nextboot and reboot that talking about nextboot would likely be confusing in nextboot.8 The nextboot.sh script no longer exists, so doesn't need to be fixed up to create rescue. However, now we need a link from nextboot to reboot. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D43831 Differential Revision: https://reviews.freebsd.org/D43843 --- rescue/rescue/Makefile | 9 +--- sbin/reboot/Makefile | 8 +-- sbin/reboot/nextboot.sh | 132 ------------------------------------------------ 3 files changed, 5 insertions(+), 144 deletions(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index de3dd8a64575..4c351e632638 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -21,13 +21,6 @@ LDFLAGS+= -Wl,--allow-multiple-definition PROG= rescue BINDIR?=/rescue -# Shell scripts need #! line to be edited from /bin/sh to /rescue/sh -SCRIPTS= nextboot_FIXED -SCRIPTSNAME_nextboot_FIXED= nextboot -nextboot_FIXED: ../../sbin/reboot/nextboot.sh - sed '1s/\/bin\//\/rescue\//' ${.ALLSRC} > ${.TARGET} -CLEANFILES+= nextboot_FIXED - SCRIPTS+= dhclient_FIXED SCRIPTSNAME_dhclient_FIXED= dhclient-script dhclient_FIXED: ../../sbin/dhclient/dhclient-script @@ -185,7 +178,7 @@ CRUNCH_SRCDIR_zfs= ${SRCTOP}/cddl/sbin/zfs CRUNCH_SRCDIR_zpool= ${SRCTOP}/cddl/sbin/zpool CRUNCH_SRCDIR_zdb= ${SRCTOP}/cddl/usr.sbin/zdb .endif -CRUNCH_ALIAS_reboot= fastboot halt fasthalt +CRUNCH_ALIAS_reboot= fastboot halt fasthalt nextboot CRUNCH_ALIAS_restore= rrestore CRUNCH_ALIAS_dump= rdump CRUNCH_ALIAS_fsck_ffs= fsck_4.2bsd fsck_ufs diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile index 4db6d5589e97..5e7a2fea15bf 100644 --- a/sbin/reboot/Makefile +++ b/sbin/reboot/Makefile @@ -13,9 +13,9 @@ MAN+= boot_i386.8 MLINKS+= boot_i386.8 boot.8 .endif -LINKS= ${BINDIR}/reboot ${BINDIR}/halt ${BINDIR}/reboot ${BINDIR}/fastboot \ - ${BINDIR}/reboot ${BINDIR}/fasthalt - -SCRIPTS= nextboot.sh +LINKS= ${BINDIR}/reboot ${BINDIR}/halt \ + ${BINDIR}/reboot ${BINDIR}/fastboot \ + ${BINDIR}/reboot ${BINDIR}/fasthalt \ + ${BINDIR}/reboot ${BINDIR}/nextboot .include diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh deleted file mode 100644 index 0c9cca51eb8d..000000000000 --- a/sbin/reboot/nextboot.sh +++ /dev/null @@ -1,132 +0,0 @@ -#! /bin/sh -# -# SPDX-License-Identifier: BSD-2-Clause -# -# Copyright (c) 2002 Gordon Tetlow. All rights reserved. -# Copyright (c) 2012 Sandvine Incorporated. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# - -append="NO" -delete="NO" -kenv= -force="NO" -nextboot_file="/boot/nextboot.conf" -zfs= - -add_kenv() -{ - local var value - - var=$1 - # strip literal quotes if passed in - value=${2%\"*} - value=${value#*\"} - - if [ -n "${kenv}" ]; then - kenv="${kenv} -" - fi - kenv="${kenv}${var}=\"${value}\"" -} - -display_usage() { - cat <<-EOF - Usage: nextboot [-af] [-e variable=value] [-k kernel] [-o options] - nextboot -D - EOF -} - -while getopts "aDe:fk:o:" argument ; do - case "${argument}" in - a) - append="YES" - ;; - D) - delete="YES" - ;; - e) - var=${OPTARG%%=*} - value=${OPTARG#*=} - if [ -z "$var" -o -z "$value" ]; then - display_usage - exit 1 - fi - add_kenv "$var" "$value" - ;; - f) - force="YES" - ;; - k) - kernel="${OPTARG}" - add_kenv kernel "$kernel" - ;; - o) - add_kenv kernel_options "${OPTARG}" - ;; - *) - display_usage - exit 1 - ;; - esac -done - -if [ ${delete} = "YES" ]; then - rm -f ${nextboot_file} - exit 0 -fi - -if [ -z "${kenv}" ]; then - display_usage - exit 1 -fi - -if [ -n "${kernel}" -a ${force} = "NO" -a ! -d /boot/${kernel} ]; then - echo "Error: /boot/${kernel} doesn't exist. Use -f to override." - exit 1 -fi - -zfs=$(df -Tn "/boot/" 2>/dev/null | while read _fs _type _other ; do - [ "zfs" = "${_type}" ] || continue - echo "${_fs%%/*}" -done) - -set -e - -nextboot_tmp=$(mktemp $(dirname ${nextboot_file})/nextboot.XXXXXX) - -if [ -n "${zfs}" ]; then - zfsbootcfg -z ${zfs} -n freebsd:nvstore -k nextboot_enable -v YES - cat >> ${nextboot_tmp} << EOF -$kenv -EOF -else -cat >> ${nextboot_tmp} << EOF -nextboot_enable="YES" -$kenv -EOF -fi - -fsync ${nextboot_tmp} - -mv ${nextboot_tmp} ${nextboot_file}