Changeset 3515 in MondoRescue for branches

Timestamp:

Feb 18, 2016, 12:06:40 AM (9 years ago)

Author:

Bruno Cornec

Message:

Fix xorriso usage for mindi with option -as mkisofs
Better ISO_CMD variable management

File:

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

branches/3.2/mindi/mindi

@@ -116 +116 @@
 if [ ! -x $ISO_CMD ]; then
     ISO_CMD="/usr/bin/genisoimage"
-fi
-
-# For compatibility with previous versions default to mkisofs
-if [ ! -x $ISO_CMD ]; then
-    ISO_CMD="/usr/bin/mkisofs"
-fi
+    # For compatibility with previous versions default to mkisofs
+    if [ ! -x $ISO_CMD ]; then
+        ISO_CMD="/usr/bin/mkisofs"
+    fi
+    if [ ! -x $ISO_CMD ]; then
+        LogFile "NOTE: No CD image (ISO file) utility found"
+        ISO_CMD = ""
+    fi
+else
+    ISO_CMD="/usr/bin/xorriso -as mkisofs"
+fi
+
+
 
 ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi"
@@ -131 +138 @@
     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
+    echo "$ISO_CMD" | grep -q "xorriso"
+    if [ $? -eq 0 ]; then
         ISO_OPT="$ISO_OPT -eltorito-alt-boot --efi-boot images/mindi-bootroot.img -no-emul-boot"
     fi
@@ -3179 +3187 @@
 fi
 
-# Check for ISO_CMD command
-if [ ! -x $ISO_CMD ]; then
-    LogFile "NOTE: No CD image (ISO file) utility found"
-fi
-
 FLOPPY_WAS_MOUNTED=""
 for mtpt in /media/floppy /mnt/floppy /floppy ; do