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

Timestamp:

Feb 9, 2016, 2:34:54 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Adds support for xorriso for UEFI distributions using it such as Debian 8

File:

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

branches/3.2/mindi/mindi

@@ -106 +106 @@
 DEPLIST_DIR="$MINDI_CONF/deplist.d"
 
-ISO_CMD="/usr/bin/mkisofs"
+# Debian 8 system e.g. use xorriso for UEFI support.
+# However, they use exactly the same command line parameters as mkisofs, so just
+# use it if it's available.
+ISO_CMD="/usr/bin/xorriso"
+
+# Mandriva system e.g. use cdrkit, which uses genisoimage.
+# However, they use exactly the same command line parameters as mkisofs, so just
+# use it if it's available.
+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
+
 ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi"
 
@@ -123 +139 @@
     [ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/lib64/syslinux/mbr.bin
 fi
-
-# Mandriva system e.g. use cdrkit, which uses genisoimage instead of mkisofs.
-# However, they use exactly the same command line parameters, so just
-# use genisoimage if it's available.
-if [ ! -x $ISO_CMD ]; then
-    ISO_CMD=/usr/bin/genisoimage
-fi
-
 
 # Function to log on screen only
@@ -1467 +1475 @@
     local i old_pwd files
     if [ -z "$ISO_CMD" ]; then
-        LogAll "ERROR: Neither mkisofs nor genisoimage found, unable to make CD image"
+        LogAll "ERROR: Neither mkisofs nor genisoimage nor xorriso found, unable to make CD image"
         return
     fi