Changeset 3533 in MondoRescue

Timestamp:

Mar 9, 2016, 7:35:58 PM (8 years ago)

Author:

Bruno Cornec

Message:

• In UEFI case, as in ia64 one we need to boot the media from the mindi-bootroot content, so clean up first before copying it to the mount point. Maybe we can point elsewhere in a next commit.

File:

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

branches/3.2/mindi/mindi

@@ -1764 +1764 @@
 if  [ "$target" = "ISO" ]; then
     # ISO
-    if [ "$ARCH" != "ia64" ] ; then
+    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"
         MakeISO
@@ -1776 +1776 @@
 if  [ "$target" = "ISO" ]; then
     cp $part $MINDI_CACHE
-    if [ "$ARCH" = "ia64" ] ; then
+    if [ "$ARCH" = "ia64" ] || [ "$BOOT_TYPE" = "UEFI" ]; 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
+        # We don't need the previous content used to make it, free space
+        rm -rf $MINDI_TMP/mpt/{EFI,initrd.img,vmlinuz,images/all.tar.gz}
+        # We need the boot image now
+        cp $MINDI_CACHE/mindi-bootroot.img $MINDI_TMP/mpt/images
         MakeISO
         umount $MINDI_TMP/mpt || Die "Unable to unmount $MINDI_TMP/mpt"
@@ -2716 +2719 @@
             fnllist=`echo $finallist | tr ' ' '\n' | sort -u | tr '\n' ' '`
             LogFile "INFO: Copying udev related files with cp -a --parents $fnllist -t $mountpoint/"
-            cp -a --parents $fnllist $lis3 -t $mountpoint/ 2> $templog  || LogIt "ERROR: Problem in udev.lis analysis" $templog
+            cp -a --parents $fnllist $lis3 -t $mountpoint/ 2> $templog  || LogIt "WARNING: Problem in udev.lis analysis" $templog
             rm -f $MINDI_TMP/udev.lis
         else