Changeset 3534 in MondoRescue for branches

Timestamp:

Mar 10, 2016, 6:03:06 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Improves again iso image creation command call for UEFI

File:

• branches/3.2/mindi/mindi (modified) (3 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 -no-emul-boot -o $MINDI_CACHE/mindi.iso "
+ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi -V Mindi_Image -o $MINDI_CACHE/mindi.iso "
 
 # Mindi set this as default in case it's invoked alone
@@ -134 +134 @@
 if [ -d "/sys/firmware/efi" ]; then
     BOOT_TYPE="UEFI"
-    ISO_OPT="$ISO_OPT -eltorito-alt-boot -efi-boot images/mindi-bootroot.img -no-emul-boot"
-    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
 else
     # Find MBR in case of bootable USB device to build
@@ -1763 +1758 @@
 
 if  [ "$target" = "ISO" ]; then
+    if [ "$ARCH" != "ia64" ]; then
+        ISO_OPT="$ISO_OPT -b $tbc/isolinux.bin -c $tbc/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
+    fi
     # ISO
     if [ "$ARCH" != "ia64" ] && [ "$BOOT_TYPE" = "BIOS" ]; then
-        CMD="$ISO_CMD $ISO_OPT -b $tbc/isolinux.bin -c $tbc/boot.cat -U -boot-load-size 4 -boot-info-table"
+        CMD="$ISO_CMD $ISO_OPT"
         MakeISO
     else
-        CMD="$ISO_CMD $ISO_OPT -b images/mindi-bootroot.img -c images/boot.cat"
+        if [ "$ARCH" = "ia64" ]; then
+            CMD="$ISO_CMD $ISO_OPT -b images/mindi-bootroot.img -c images/boot.cat"
+        else
+            # UEFI
+            echo "$CMD" | grep -q "xorriso"
+            if [ $? -eq 0 ]; then
+                CMD="$ISO_CMD $ISO_OPT -eltorito-alt-boot --efi-boot images/mindi-bootroot.img -no-emul-boot"
+            else
+                CMD="$ISO_CMD $ISO_OPT -eltorito-alt-boot -efi-boot images/mindi-bootroot.img -no-emul-boot"
+            fi
+        fi
     fi
 fi