Changeset 3532 in MondoRescue for branches

Timestamp:

Mar 9, 2016, 6:47:39 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Create a new MakeISO function to share that code
• Fix ia64 case where you need to remount the bootable media to store the image before using it

File:

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

branches/3.2/mindi/mindi

@@ -1477 +1477 @@
 }
 
+MakeISO() {
+
+LogAll "INFO: Invoking $CMD"
+(cd "$MINDI_TMP/mpt" ; $CMD .) > /dev/null 2> $MINDI_TMP/mkisofs.log
+if [ $? -ne 0 ] ; then
+    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
+            LogAll "INFO: Created bootable ISO image at $MINDI_CACHE/mindi.iso"
+        else
+            MakeISOErrors
+        fi
+    else
+        MakeISOErrors
+    fi
+else
+    LogAll "INFO: Created bootable ISO image at $MINDI_CACHE/mindi.iso"
+fi
+rm -f $MINDI_TMP/mkisofs.log
+}
+
 MakeBootableDevice() {
 
@@ -1708 +1731 @@
     MindiExit -1
 fi
+if  [ "$target" = "ISO" ]; then
+    if [ "$BOOT_TYPE" = "BIOS" ]; then
+        # syslinux should be run on a local file (doen't work through NFS Cf: #297)
+        # and run after the formating for versions > 6 it seems
+        syslinux $part >> $LOGFILE 2>> $LOGFILE
+    fi
+fi
 LogAll "INFO: Mounting $part on $MINDI_TMP/mpt"
 mount -t vfat $mount_opt $part $MINDI_TMP/mpt 2>> $LOGFILE
@@ -1736 +1766 @@
     if [ "$ARCH" != "ia64" ] ; then
         CMD="$ISO_CMD $ISO_OPT -b $tbc/isolinux.bin -c $tbc/boot.cat -U -boot-load-size 4 -boot-info-table"
+        MakeISO
     else
         CMD="$ISO_CMD $ISO_OPT -b images/mindi-bootroot.img -c images/boot.cat"
     fi
-    LogAll "INFO: Invoking $CMD"
-    (cd "$MINDI_TMP/mpt" ; $CMD .) > /dev/null 2> $MINDI_TMP/mkisofs.log
-    if [ $? -ne 0 ] ; then
-        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
-                LogAll "INFO: Created bootable ISO image at $MINDI_CACHE/mindi.iso"
-            else
-                MakeISOErrors
-            fi
-        else
-            MakeISOErrors
-        fi
-    else
-        LogAll "INFO: Created bootable ISO image at $MINDI_CACHE/mindi.iso"
-    fi
-    rm -f $MINDI_TMP/mkisofs.log
 fi
 
@@ -1763 +1775 @@
 
 if  [ "$target" = "ISO" ]; then
-    # ISO
-    if [ "$BOOT_TYPE" = "BIOS" ]; then
-        # syslinux should be run on a local file (doen't work through NFS Cf: #297)
-        # and run after the formating for versions > 6 it seems
-        syslinux $part >> $LOGFILE 2>> $LOGFILE
-    fi
     cp $part $MINDI_CACHE
+    if [ "$ARCH" = "ia64" ] ; then
+        # Here we need to remount to put the boot image at the right place now it's available
+        mount -t vfat $mount_opt $part $MINDI_TMP/mpt 2>> $LOGFILE
+        cp $MINDI_CACHE/$part $MINDI_TMP/mpt/images
+        MakeISO
+        umount $MINDI_TMP/mpt || Die "Unable to unmount $MINDI_TMP/mpt"
+    fi
 else
     # USB