Page MenuHomeFreeBSD
Files F131859686

D43831.id134217.diff
No OneTemporary
Actions

D43831.id134217.diff
View Options

diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -21,13 +21,6 @@
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_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
--- a/sbin/reboot/Makefile
+++ b/sbin/reboot/Makefile
@@ -13,9 +13,9 @@
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>
diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh
deleted file mode 100644
--- 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}

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 12, 6:35 PM (4 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23603269
Default Alt Text
D43831.id134217.diff (4 KB)

Event Timeline