Changeset 3406 in MondoRescue for branches/3.2/mondo

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/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• include/my-stuff.h (modified) (2 diffs)

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"
 
 /**