Changeset 3406 in MondoRescue for branches

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.

Location:

branches/3.2

Files:

• mindi/mindi (modified) (3 diffs)
• mondo-doc/mindi.8 (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/include/my-stuff.h (modified) (2 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)"

branches/3.2/mondo-doc/mindi.8

@@ -153 +153 @@
 initrd image for bootable ISO image.
 .TP
-.I /var/cache/mindi/mindi-boot.F.img
+.I /var/cache/mindi/mindi-bootroot.img
 .B mindi
-boot media of size F [KB].
-.TP
-.I /var/cache/mindi/mindi-root.F.img
-.B mindi
-root media of size F [KB].
-.TP
-.I /var/cache/mindi/mindi-data.N.img
-.B mindi
-data media number N for boot/root media.
+boot and root media.
 .TP
 .I /var/cache/mindi/mindi.iso

branches/3.2/mondo/src/common/libmondo-archive.c

@@ -1807 +1807 @@
 #else
                 log_msg(1, "Non-ia64 --> lilo");
-                mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
+                mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.img -c boot.cat -o '_ISO_' -J -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
                 // FIXME: fixed boot size probably wrong. lilo to be removed
                 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);

branches/3.2/mondo/src/include/my-stuff.h

@@ -193 +193 @@
  * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image.
  */
-#define MONDO_MKISOFS_REGULAR_ELILO      MONDO_MKISOFS"-J -no-emul-boot -b images/mindi-bootroot."IA64_BOOT_SIZE".img -c boot.cat "
+#define MONDO_MKISOFS_REGULAR_ELILO      MONDO_MKISOFS"-J -no-emul-boot -b images/mindi-bootroot.img -c boot.cat "
 
 /**
@@ -208 +208 @@
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
      */
-#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-boot.2880.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-bootroot.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
 
 /**