release/amd64: Check config variables instead of checking files

Check the MK_LOADER_IA32 variable instead of manually checking if the file exists. Signed-off-by: Ahmad Khalifa <[email protected]>
freebsd · Jan 11, 2025 · da3e113 · da3e113
1 parent 76658cd
commit da3e113
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh
@@ -60,12 +60,10 @@ fi
 
 # Make an ESP in a file.
 espfilename=$(mktemp /tmp/efiboot.XXXXXX)
-if [ -f "${BASEBITSDIR}/boot/loader_ia32.efi" ]; then
-	make_esp_file ${espfilename} ${fat32min} ${BASEBITSDIR}/boot/loader.efi bootx64 \
-	    ${BASEBITSDIR}/boot/loader_ia32.efi bootia32
-else
-	make_esp_file ${espfilename} ${fat32min} ${BASEBITSDIR}/boot/loader.efi
+if [ ${MK_LOADER_IA32} = "yes" ]; then
+	extra_args="${BASEBITSDIR}/boot/loader_ia32.efi bootia32"
 fi
+make_esp_file ${espfilename} ${fat32min} ${BASEBITSDIR}/boot/loader.efi bootx64 ${extra_args}
 
 mkimg -s mbr \
     -b ${BASEBITSDIR}/boot/mbr \

diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh
@@ -64,12 +64,10 @@ if [ "$1" = "-b" ]; then
 	espfilename=$(mktemp /tmp/efiboot.XXXXXX)
 	# ESP file size in KB.
 	espsize="2048"
-	if [ -f "${BASEBITSDIR}/boot/loader_ia32.efi" ]; then
-		make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi bootx64 \
-		    ${BASEBITSDIR}/boot/loader_ia32.efi bootia32
-	else
-		make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi
+	if [ ${MK_LOADER_IA32} = "yes" ]; then
+		extra_args="${BASEBITSDIR}/boot/loader_ia32.efi bootia32"
 	fi
+	make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi bootx64 ${extra_args}
 	bootable="$bootable -o bootimage=i386;${espfilename} -o no-emul-boot -o platformid=efi"
 
 	shift