d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore /boot/efi to mtree.

Browse Source 
Instead of whether /boot/efi exists, which it now always does, including
on systems that don't and can't use EFI, use whether /boot/efi is
present in fstab to signal to the installer that it is a valid ESP and
should be configured. This has essentially the same semantics, but allows
/boot/efi to be created unconditionally.

Reviewed by:	bdragon, imp
Tested by:	bdragon (ppc64)
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D29068
This commit is contained in:
Nathan Whitehorn 2021-03-05 20:57:50 -05:00
parent d08b8680e1
commit e77cf2a4ab
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/mtree/BSD.root.dist
View File

@ -18,6 +18,8 @@
rockchip tags=package=runtime rockchip tags=package=runtime
.. ..
.. ..
efi
..
firmware firmware
.. ..
loader.conf.d tags=package=bootloader loader.conf.d tags=package=bootloader

2
usr.sbin/bsdinstall/scripts/bootconfig
View File

@ -47,7 +47,7 @@ if [ `uname -m` == powerpc ]; then
fi fi
# Update the ESP (EFI System Partition) with the new bootloader if we have an ESP # 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 case $(uname -m) in
arm64) ARCHBOOTNAME=aa64 ;; arm64) ARCHBOOTNAME=aa64 ;;
amd64) ARCHBOOTNAME=x64 ;; amd64) ARCHBOOTNAME=x64 ;;