From: Omgalof <Omgalof@users.noreply.github.com>
Date: Sat, 16 Jan 2021 12:59:23 +0000 (-0300)
Subject: [build] Include xorrisofs as a viable mkisofs equivalent
X-Git-Tag: secboot-ioactive-20221109~300
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fb37a48a9405a6b3b0c5b198bdd87f1a4bb51f0;p=thirdparty%2Fipxe.git

[build] Include xorrisofs as a viable mkisofs equivalent

Add support for xorrisofs, a GNU mkisofs equivalent that is available
in most distro repositories.

Modified-by: Michael Brown <mcb30@ipxe.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/util/genfsimg b/src/util/genfsimg
index e49d4d7ed..a1fad247e 100755
--- a/src/util/genfsimg
+++ b/src/util/genfsimg
@@ -149,7 +149,7 @@ ISOARGS=
 #
 if [ -n "${ISOIMG}" ] ; then
     MKISOFS=
-    for CMD in genisoimage mkisofs ; do
+    for CMD in genisoimage mkisofs xorrisofs ; do
 	if ${CMD} --version >/dev/null 2>/dev/null ; then
 	    MKISOFS="${CMD}"
 	    break
@@ -211,7 +211,7 @@ if [ -n "${ISOIMG}" ] ; then
     ISOARGS="${ISOARGS} -no-emul-boot -eltorito-boot isolinux.bin"
     ISOARGS="${ISOARGS} -boot-load-size 4 -boot-info-table"
     if [ -n "${EFI}" ] ; then
-	ISOARGS="${ISOARGS} -eltorito-alt-boot -no-emul-boot -efi-boot esp.img"
+	ISOARGS="${ISOARGS} -eltorito-alt-boot -no-emul-boot -e esp.img"
     else
 	FATIMG=
     fi