D29068.id85256.diff
No OneTemporary
Actions

Size

848 B

Referenced Files

None

Subscribers

None

D29068.id85256.diff
View Options

	diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
	--- a/etc/mtree/BSD.root.dist
	+++ b/etc/mtree/BSD.root.dist
	@@ -18,6 +18,8 @@
	rockchip tags=package=runtime
	..
	..
	+ efi
	+ ..
	firmware
	..
	loader.conf.d tags=package=bootloader
	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
	@@ -47,7 +47,7 @@
	fi

	# Update the ESP (EFI System Partition) with the new bootloader if we have an ESP
	-if [ -d "$BSDINSTALL_CHROOT/boot/efi" ]; then
	+if [ -n "$(awk '{if ($2=="/boot/efi") printf("%s\n",$1);}' $PATH_FSTAB)" ]; then
	case $(uname -m) in
	arm64) ARCHBOOTNAME=aa64 ;;
	amd64) ARCHBOOTNAME=x64 ;;