From: David Marec <DavidMarec@users.noreply.github.com>
Date: Sun, 21 Feb 2021 22:06:53 +0000 (+0100)
Subject: Format EFI partition
X-Git-Url: http://popeye.lapinbilly.eu/git/?p=zfsinstaller.git;a=commitdiff_plain;h=refs%2Fheads%2Fstable%2F13

Format EFI partition
---

diff --git a/zfsinstall.sh b/zfsinstall.sh
index 7d4b589..720801f 100644
--- a/zfsinstall.sh
+++ b/zfsinstall.sh
@@ -41,6 +41,7 @@ for D in ${DESTDISKS}; do
 	N=$( echo ${D} | tr -c -d '0-9' )
 	gpart create -s gpt ${D}
 	gpart add -a 4k -t efi -s 200M -l efiboot${N} ${D} 
+	newfs_msdos -F 32 -c 1 /dev/${D}p1
 	gpart add -a 4k -t freebsd-boot -s 512k -l gptboot${N} ${D} 
 	gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 2 ${D} 
 	gpart add -a 1m -s 32G -t freebsd-swap -l swap${N} ${D} 
@@ -111,7 +112,7 @@ done
 
 for D in ${DESTDISKS}; do
 	echo copying EFI partcode at ${D}
-	mount -t msdosfs /dev/${D}s1 /mnt/boot && cp ${DDESTDIR}/boot/loader.efi /mnt/boot/BOOTX64.EFI 
+	mount -t msdosfs /dev/${D}p1 /mnt/boot && mkdir -p /mnt/boot/EFI/BOOT && cp ${DDESTDIR}/boot/loader.efi /mnt/boot/EFI/BOOT/BOOTX64.EFI 
 	umount /mnt/boot
 done