aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Dal'Ava Junior <alfredo@FreeBSD.org>2021-11-26 00:02:53 +0000
committerAlfredo Dal'Ava Junior <alfredo@FreeBSD.org>2021-12-01 22:41:49 +0000
commit060c97abb0192568ca6807d39ed822593c3f1459 (patch)
treeb3606928cd765be3f0ea29cb1be2c7a46fa231f2
parent10199101997bdc352a74998dc7a39a24f5d722c4 (diff)
downloadsrc-060c97abb0192568ca6807d39ed822593c3f1459.tar.gz
src-060c97abb0192568ca6807d39ed822593c3f1459.zip
powerpc64: make autoboot possible on powernv machines
It's required to specify a default boot option in order to make petitboot's autoboot feature work. Tested on Raptor Blackbird Reviewed by: imp, luporl MFC after: 2 days Sponsored by: Instituto de Pesquisas Eldorado (eldorado.org.br) Differential Revision: https://reviews.freebsd.org/D32838 (cherry picked from commit b6644f529ca4c13975727c5625415fcc30c60af6)
-rwxr-xr-xusr.sbin/bsdinstall/scripts/bootconfig11
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.sbin/bsdinstall/scripts/bootconfig b/usr.sbin/bsdinstall/scripts/bootconfig
index c0a0ff4f77ee..c5218b10a271 100755
--- a/usr.sbin/bsdinstall/scripts/bootconfig
+++ b/usr.sbin/bsdinstall/scripts/bootconfig
@@ -27,6 +27,9 @@
#
# $FreeBSD$
+
+FREEBSD_BOOTLABEL="FreeBSD"
+
BSDCFG_SHARE="/usr/share/bsdconfig"
. $BSDCFG_SHARE/common.subr || exit 1
@@ -41,8 +44,10 @@ if [ `uname -m` == powerpc ]; then
platform=`sysctl -n hw.platform`
if [ "$platform" == ps3 -o "$platform" == powernv ]; then
rootpart=$(awk '{ if($2 == "/") printf("%s:%s\n", $3, $1); }' $PATH_FSTAB)
+ kboot_conf=$BSDINSTALL_CHROOT/boot/etc/kboot.conf
mkdir -p $BSDINSTALL_CHROOT/boot/etc/
- echo FreeBSD=\'/kernel/kernel kernelname=/boot/kernel/kernel vfs.root.mountfrom=${rootpart}\' > $BSDINSTALL_CHROOT/boot/etc/kboot.conf
+ echo default=$FREEBSD_BOOTLABEL > $kboot_conf
+ echo $FREEBSD_BOOTLABEL=\'/kernel/kernel kernelname=/boot/kernel/kernel vfs.root.mountfrom=${rootpart}\' >> $kboot_conf
fi
fi
@@ -81,11 +86,9 @@ if [ -n "$(awk '{if ($2=="/boot/efi") printf("%s\n",$1);}' $PATH_FSTAB)" ]; then
cp "$BSDINSTALL_CHROOT/boot/loader.efi" "${mntpt}/${BOOTNAME}"
fi
- bootlabel="FreeBSD"
-
if [ "$BSDINSTALL_CONFIGCURRENT" ]; then
f_dprintf "Creating UEFI boot entry"
- efibootmgr --create --activate --label "$bootlabel" --loader "${mntpt}/${FREEBSD_BOOTNAME}" > /dev/null
+ efibootmgr --create --activate --label "$FREEBSD_BOOTLABEL" --loader "${mntpt}/${FREEBSD_BOOTNAME}" > /dev/null
fi
f_dprintf "Finished configuring ESP"