[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 c13158203b7ca86cfb35bfec1cc5f85a36a64550..731fa6ce0d93d5dde73bfc839de858b6bc7f9bc9 100755 (executable)
--- 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