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

Timestamp:

Aug 6, 2015, 8:10:25 AM (9 years ago)

Author:

Bruno Cornec

Message:

Homogeneize bootroot image name

In bth mindi and mondo use systematically mindi-bootroot.img as the name
of the bootable image used to make CD. Simpler and always the same for
all cases.

File:

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

branches/3.2/mindi/mindi

@@ -1504 +1504 @@
         $ISO_CMD -U $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
     else
-        $ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.$BOOT_SIZE.img -c images/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
+        $ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.img -c images/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
     fi
     if [ "$?" -ne "0" ] ; then
@@ -1861 +1861 @@
     TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/initrd.img `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into initrd.img; are you SURE your kernel supports loopfs?"
     echo -en "..."
-    imagefile=$MINDI_TMP/mindi-bootroot.$BOOT_SIZE.img
+    imagefile=$MINDI_TMP/mindi-bootroot.img
     mkdir -p $mountpoint
     dd if=/dev/zero of=$imagefile bs=1k count=$BOOT_SIZE &> /dev/null || Die "Cannot dd blank file"
@@ -1872 +1872 @@
 
     # Only move it now to its final destination and use it now
-    mv $imagefile $imagesdir
-    imagefile=$imagesdir/mindi-bootroot.$BOOT_SIZE.img
+    mv $imagefile $MINDI_CACHE
+    imagefile=$MINDI_CACHE/mindi-bootroot.img
 
     mount -t vfat -o loop $imagefile $mountpoint || LogAll "ERROR: Cannot mount (PBDI)"