D26428.id77025.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D26428.id77025.diff
View Options

	Index: usr.sbin/bsdinstall/scripts/bootconfig
	===================================================================
	--- usr.sbin/bsdinstall/scripts/bootconfig
	+++ usr.sbin/bsdinstall/scripts/bootconfig
	@@ -124,6 +124,15 @@
	done
	fi

	+ case $(uname -m) in
	+ arm64) ARCHBOOTNAME=aa64 ;;
	+ amd64) ARCHBOOTNAME=x64 ;;
	+ # arm) ARCHBOOTNAME=arm ;; # No other support for arm install
	+ # i386) ARCHBOOTNAME=ia32 ;; # no support for this in i386 kernels, rare machines
	+ *) die "Unsupported arch $(uname -m) for UEFI install"
	+ esac
	+ BOOTNAME="/EFI/BOOT/BOOT${ARCHBOOTNAME}.EFI"
	+
	for esp in $ESPS; do
	f_dprintf "Formatting /dev/${esp} as FAT32"
	newfs_msdos -F 32 -c 1 -L EFISYS "/dev/$esp" > /dev/null 2>&1
	@@ -141,6 +150,9 @@
	f_dprintf "Installing loader.efi onto ESP"
	mkdir -p "$mntpt/EFI/freebsd"
	cp "$BSDINSTALL_CHROOT/boot/loader.efi" "${mntpt}/EFI/freebsd/loader.efi"
	+ if [ ! -f "${mntpt}/${BOOTNAME}" ]; then
	+ cp "$BSDINSTALL_CHROOT/boot/loader.efi" "${mntpt}/${BOOTNAME}"
	+ fi

	if [ "$num_esps" -gt 1 ]; then
	bootlabel="FreeBSD (${esp})"