Changeset 3596 in MondoRescue for branches/3.2/mindi

Timestamp:

Jul 6, 2016, 4:15:31 PM (8 years ago)

Author:

Bruno Cornec

Message:

-Fix volid warning

• Try to improve UEFI support with xorriso (remove unsupported option eltorito-platform)

File:

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

branches/3.2/mindi/mindi

@@ -127 +127 @@
 fi
 
-ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi -V Mindi-Image -o $MINDI_CACHE/mindi.iso "
+ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi -V MindiCD -o $MINDI_CACHE/mindi.iso "
 
 # Mindi set this as default in case it's invoked alone
@@ -1468 +1468 @@
 
 LogFile "----------- $ISO_CMD's errors --------------"
+LogAll "Command invoked: $CMD ."
 LogAll "$ISO_CMD returned the following errors:"
 cat $MINDI_TMP/mkisofs.log | tee -a $LOGFILE
@@ -1475 +1476 @@
 MakeISO() {
 
-LogAll "INFO: Invoking $CMD ."
+LogAll "INFO: Generating ISO image."
 (cd "$MINDI_TMP/mpt" ; $CMD .) > /dev/null 2> $MINDI_TMP/mkisofs.log
 if [ $? -ne 0 ] ; then
+    # In case of UEFI handle differences in option handling
     if [ "$BOOT_TYPE" = "UEFI" ]; then
         CMD=`echo $CMD | perl -p -e 's|--efi-boot |-eltorito-platform 0xEF -eltorito-boot |; s|-efi-boot |-eltorito-platform 0xEF -eltorito-boot |;'`
-        LogAll "INFO: Invoking instead $CMD"
         (cd "$MINDI_TMP/mpt" ; $CMD .) > /dev/null 2> $MINDI_TMP/mkisofs.log
-        if [ $? -eq 0 ] ; then
+        if [ $? -ne 0 ] ; then
+            # xorriso e.g.
+            CMD=`echo $CMD | perl -p -e 's|-eltorito-platform 0xEF ||'`
+            (cd "$MINDI_TMP/mpt" ; $CMD .) > /dev/null 2> $MINDI_TMP/mkisofs.log
+            if [ $? -eq 0 ] ; then
+                LogAll "INFO: Invoking $CMD ."
+                LogAll "INFO: Created bootable ISO image at $MINDI_CACHE/mindi.iso"
+            else
+                MakeISOErrors
+        else
+            LogAll "INFO: Invoking $CMD ."
             LogAll "INFO: Created bootable ISO image at $MINDI_CACHE/mindi.iso"
-        else
-            MakeISOErrors
         fi
     else
@@ -1491 +1500 @@
     fi
 else
+    LogAll "INFO: Invoking $CMD ."
     LogAll "INFO: Created bootable ISO image at $MINDI_CACHE/mindi.iso"
 fi