git: 34766aa8cb51 - main - Fix scripted installs on EFI systems using ZFS root with zfsboot.

[Nathan Whitehorn]

The branch main has been updated by nwhitehorn:

URL: https://cgit.FreeBSD.org/src/commit/?id=34766aa8cb514472c571f8b0e90e833833acef51

commit 34766aa8cb514472c571f8b0e90e833833acef51
Author:     Nathan Whitehorn <nwhitehorn at FreeBSD.org>
AuthorDate: 2021-05-14 12:30:41 +0000
Commit:     Nathan Whitehorn <nwhitehorn at FreeBSD.org>
CommitDate: 2021-05-14 12:30:41 +0000

    Fix scripted installs on EFI systems using ZFS root with zfsboot.
    
    Unlike attended installations, scripted installs did not mount non-ZFS
    partitions when ZFS root (via zfsboot) was selected. Since this included
    the ESP, the EFI loader was not installed. Copy logic from the
    attended-install path to make this work.
    
    PR:             255824, 255081
    MFC after:      1 week
    Obtained from:  Mark Huizer
---
 usr.sbin/bsdinstall/scripts/script | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script
index 1d8e52a9d6d3..6a03e88bba39 100755
--- a/usr.sbin/bsdinstall/scripts/script
+++ b/usr.sbin/bsdinstall/scripts/script
@@ -111,8 +111,8 @@ if [ "$ZFSBOOT_DISKS" ]; then
 	bsdinstall zfsboot
 else
 	bsdinstall scriptedpart "$PARTITIONS"
-	bsdinstall mount
 fi
+bsdinstall mount
 
 # Unpack distributions
 bsdinstall checksum
@@ -163,9 +163,8 @@ fi
 bsdinstall entropy
 if [ "$ZFSBOOT_DISKS" ]; then
 	zpool export $ZFSBOOT_POOL_NAME
-else
-	bsdinstall umount
 fi
+bsdinstall umount
 
 f_dprintf "Installation Completed at %s" "$( date )"