From 38356b60eb9bf2bc124c0863db88c7a598a9b054 Mon Sep 17 00:00:00 2001
From: Ryan Moeller <ryan@iXsystems.com>
Date: Tue, 14 Sep 2021 12:35:23 -0400
Subject: [PATCH] Update ISO image build script to fix UEFI booting

Adopt recent changes in FreeBSD to increase the ESP size after loader
has grown beyond 800kB and restore partition order after mkimg changes.

While here, label the ESP "EFISYS" to match FreeBSD.

Jira: NAS-110869
---
 build/tools/make_iso_image.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/tools/make_iso_image.sh b/build/tools/make_iso_image.sh
index 6438e46..9d3e7be 100755
--- a/build/tools/make_iso_image.sh
+++ b/build/tools/make_iso_image.sh
@@ -51,7 +51,8 @@ $MAKEFS -t msdos \
     -o fat_type=12 \
     -o media_descriptor=248 \
     -o sectors_per_cluster=1 \
-    -s 800k \
+    -o volume_label=EFISYS \
+    -s 2048k \
     efiboot.img "$stagedir"
 rm -rf "$stagedir"
 
@@ -80,8 +81,8 @@ imgsize=`stat -f %z $NAME`
 $MKIMG -s gpt \
     --capacity $imgsize \
     -b $OBJDIR/boot/pmbr \
-    $espparam \
     -p freebsd-boot:="$OBJDIR/boot/isoboot" \
+    $espparam \
     -o hybrid.img
 
 # Drop the PMBR, GPT, and boot code into the System Area of the ISO.