From: Michael Brown <mcb30@ipxe.org>
Date: Tue, 23 Nov 2021 15:20:09 +0000 (+0000)
Subject: [build] Include EFI system partition table entry in isohybrid images
X-Git-Tag: secboot-ioactive-20221109~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f4cc4b5a7f780111c3ef2e1d4bba175896f8537;p=thirdparty%2Fipxe.git

[build] Include EFI system partition table entry in isohybrid images

Add the "--uefi" option when invoking isohybrid on an EFI-bootable
image, to create a partition mapping to the EFI system partition
embedded within the ISO image.

This allows the resulting isohybrid image to be booted on UEFI systems
that will not recognise an El Torito boot catalog on a non-CDROM
device.

Originally-fixed-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/util/genfsimg b/src/util/genfsimg
index c13158203..731fa6ce0 100755
--- a/src/util/genfsimg
+++ b/src/util/genfsimg
@@ -308,6 +308,9 @@ if [ -n "${ISOIMG}" ] ; then
 	    ${ISOARGS} "${ISODIR}"
     if isohybrid --version >/dev/null 2>&1 ; then
 	ISOHYBRIDARGS=
+	if [ -n "${EFI}" ] ; then
+	    ISOHYBRIDARGS="${ISOHYBRIDARGS} --uefi"
+	fi
 	if [ -n "${SOURCE_DATE_EPOCH:-}" ] ; then
 	    ISOHYBRIDARGS="${ISOHYBRIDARGS} --id ${SOURCE_DATE_EPOCH}"
 	fi