Date: Sun, 30 Jul 2017 23:15:30 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r321734 - head/usr.sbin/bsdinstall/scripts Message-ID: <201707302315.v6UNFUH4099099@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Sun Jul 30 23:15:30 2017 New Revision: 321734 URL: https://svnweb.freebsd.org/changeset/base/321734 Log: bsdinstall: default to UEFI-only boot on arm64 Reviewed by: allanjude Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D11721 Modified: head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/usr.sbin/bsdinstall/scripts/zfsboot ============================================================================== --- head/usr.sbin/bsdinstall/scripts/zfsboot Sun Jul 30 22:34:24 2017 (r321733) +++ head/usr.sbin/bsdinstall/scripts/zfsboot Sun Jul 30 23:15:30 2017 (r321734) @@ -1554,17 +1554,27 @@ f_dprintf "BSDINSTALL_TMPETC=[%s]" "$BSDINSTALL_TMPETC 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707302315.v6UNFUH4099099>