Page MenuHomeFreeBSD
Files F145895431

D55469.id172544.diff
No OneTemporary
Actions

D55469.id172544.diff
View Options

diff --git a/usr.sbin/bsdinstall/scripts/bootconfig b/usr.sbin/bsdinstall/scripts/bootconfig
--- a/usr.sbin/bsdinstall/scripts/bootconfig
+++ b/usr.sbin/bsdinstall/scripts/bootconfig
@@ -83,11 +83,13 @@
update_uefi_bootentry()
{
- nentries=$(efibootmgr | grep -c "${EFI_LABEL_NAME}$")
+ local nentries=$(efibootmgr | grep -c "${EFI_LABEL_NAME}$")
+ local loader_path="$BSDINSTALL_CHROOT/boot/efi/efi/freebsd/$1"
+
# No entries so directly create one and return
if [ ${nentries} -eq 0 ]; then
f_dprintf "Creating UEFI boot entry"
- efibootmgr --create --activate --label "$EFI_LABEL_NAME" --loader "${mntpt}/${FREEBSD_BOOTNAME}" > /dev/null
+ efibootmgr --create --activate --label "$EFI_LABEL_NAME" --loader "${loader_path}" > /dev/null
return
fi
@@ -97,13 +99,13 @@
for entry in $(efibootmgr | awk "\$NF == \"$EFI_LABEL_NAME\" { sub(/.*Boot/,\"\", \$1); sub(/\*/,\"\", \$1); print \$1 }"); do
efibootmgr -B -b ${entry}
done
- efibootmgr --create --activate --label "$EFI_LABEL_NAME" --loader "${mntpt}/${FREEBSD_BOOTNAME}" > /dev/null
+ efibootmgr --create --activate --label "$EFI_LABEL_NAME" --loader "${loader_path}" > /dev/null
return
fi
FREEBSD_BOOTLABEL=$(dialog_uefi_entryname "${EFI_LABEL_NAME}")
[ $? -eq $DIALOG_CANCEL ] && exit 1
- efibootmgr --create --activate --label "$FREEBSD_BOOTLABEL" --loader "${mntpt}/${FREEBSD_BOOTNAME}" > /dev/null
+ efibootmgr --create --activate --label "$FREEBSD_BOOTLABEL" --loader "${loader_path}" > /dev/null
}
f_dialog_title "Boot Configuration"
@@ -165,7 +167,7 @@
# Try to set the UEFI NV BootXXXX variables to record the boot location
if [ "$BSDINSTALL_CONFIGCURRENT" ] && [ "$ARCHBOOTNAME" != ia32 ]; then
- update_uefi_bootentry
+ update_uefi_bootentry "${file}"
fi
f_dprintf "Finished configuring ESP"

File Metadata

Mime Type
text/plain
Expires
Thu, Feb 26, 8:44 PM (13 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28978765
Default Alt Text
D55469.id172544.diff (1 KB)

Event Timeline