Changeset 3505 in MondoRescue for branches/3.2/mindi/mindi

Timestamp:

Feb 12, 2016, 4:12:26 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Should fix errors when used with xorriso and UEFI (option efi-boot should have -- in that case not -)

File:

• branches/3.2/mindi/mindi (modified) (3 diffs)

branches/3.2/mindi/mindi

@@ -115 +115 @@
 # use it if it's available.
 if [ ! -x $ISO_CMD ]; then
-    ISO_CMD=/usr/bin/genisoimage
+    ISO_CMD="/usr/bin/genisoimage"
 fi
 
 # For compatibility with previous versions default to mkisofs
 if [ ! -x $ISO_CMD ]; then
-    ISO_CMD=/usr/bin/mkisofs
+    ISO_CMD="/usr/bin/mkisofs"
 fi
 
@@ -131 +131 @@
     BOOT_TYPE="UEFI"
     ISO_OPT="$ISO_OPT -eltorito-alt-boot -efi-boot images/mindi-bootroot.img -no-emul-boot"
+    if [ "$ISO_CMD" = "/usr/bin/xorriso" ]; then
+        ISO_OPT="$ISO_OPT -eltorito-alt-boot --efi-boot images/mindi-bootroot.img -no-emul-boot"
+    fi
 else
     # Find MBR in case of bootable USB device to build
@@ -1545 +1548 @@
     if [ "$?" -ne "0" ] ; then
         if [ "$BOOT_TYPE" = "UEFI" ]; then
+            CMD=`echo $CMD | perl -p -e 's|--efi-boot |-eltorito-platform 0xEF -eltorito-boot |'`
             CMD=`echo $CMD | perl -p -e 's|-efi-boot |-eltorito-platform 0xEF -eltorito-boot |'`
             $CMD . > /dev/null 2> $MINDI_TMP/mkisofs.log