Page MenuHomeFreeBSD
Files F160009305

D11721.id.diff
No OneTemporary
Actions

D11721.id.diff
View Options

Index: head/usr.sbin/bsdinstall/scripts/zfsboot
===================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot
+++ head/usr.sbin/bsdinstall/scripts/zfsboot
@@ -1554,17 +1554,27 @@
f_dprintf "FSTAB_FMT=[%s]" "$FSTAB_FMT"
#
-# If the system was booted with UEFI, set the default boot type to UEFI
+# Determine default boot type
#
-bootmethod=$( sysctl -n machdep.bootmethod )
-f_dprintf "machdep.bootmethod=[%s]" "$bootmethod"
-if [ "$bootmethod" = "UEFI" ]; then
- : ${ZFSBOOT_BOOT_TYPE:=BIOS+UEFI}
+case $(uname -m) in
+arm64)
+ # We support only UEFI boot for arm64
+ : ${ZFSBOOT_BOOT_TYPE:=UEFI}
: ${ZFSBOOT_PARTITION_SCHEME:=GPT}
-else
- : ${ZFSBOOT_BOOT_TYPE:=BIOS}
- : ${ZFSBOOT_PARTITION_SCHEME:=GPT}
-fi
+ ;;
+*)
+ # If the system was booted with UEFI, set the default boot type to UEFI
+ bootmethod=$( sysctl -n machdep.bootmethod )
+ f_dprintf "machdep.bootmethod=[%s]" "$bootmethod"
+ if [ "$bootmethod" = "UEFI" ]; then
+ : ${ZFSBOOT_BOOT_TYPE:=BIOS+UEFI}
+ : ${ZFSBOOT_PARTITION_SCHEME:=GPT}
+ else
+ : ${ZFSBOOT_BOOT_TYPE:=BIOS}
+ : ${ZFSBOOT_PARTITION_SCHEME:=GPT}
+ fi
+ ;;
+esac
#
# Loop over the main menu until we've accomplished what we came here to do

File Metadata

Mime Type
text/plain
Expires
Sun, Jun 21, 12:40 PM (5 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34149347
Default Alt Text
D11721.id.diff (1 KB)

Event Timeline