system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

rescue,nextboot: Install nextboot as a link to reboot, rm nextboot.sh

Browse source 
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
This commit is contained in:
Warner Losh 2024-02-12 11:46:20 -07:00
parent 994cc83921
commit fd6d47375a
3 changed files with 5 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rescue/rescue/Makefile
View file

@ -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

8
sbin/reboot/Makefile
View file

@ -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 <bsd.prog.mk>

132
sbin/reboot/nextboot.sh
View file

@ -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}