Changeset 2626 in MondoRescue

Timestamp:

Apr 28, 2010, 2:59:33 AM (14 years ago)

Author:

Bruno Cornec

Message:

Avoid to have multiple similar calls to mkisofs by using macros

Location:

branches/2.2.9/mondo/src

Files:

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

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

@@ -1859 +1859 @@
             if (bkpinfo->make_cd_use_lilo) {
                 log_msg(1, "make_cd_use_lilo = TRUE");
-// FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
-// and add ' .' at end
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                res = eval_call_to_make_ISO("mkisofs -no-emul-boot -b images/mindi-bootroot."
-                                            IA64_BOOT_SIZE
-                                            ".img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
+                res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_ELILO"-o '_ISO_' _CD#_ .",
                                             destfile,
                                             g_current_media_number,
@@ -1871 +1867 @@
                                             message_to_screen);
 #else
-// FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
-// and add ' .' at end
                 log_msg(1, "Non-ia64 --> lilo");
                 res =
-                    eval_call_to_make_ISO("mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
+                    // FIXME: fixed boot size probably wrong. lilo to be removed
+                    eval_call_to_make_ISO(MONDO_MKISOFS"-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J _CD#_ .",
                                           destfile, g_current_media_number,
                                           MONDO_LOGFILE,
@@ -1884 +1879 @@
                 log_msg(1, "Isolinux");
                 res =
-                    eval_call_to_make_ISO("mkisofs -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
+                    eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_SYSLINUX"-o '_ISO_' _CD#_ .",
                                           destfile, g_current_media_number,
                                           MONDO_LOGFILE,

branches/2.2.9/mondo/src/common/libmondo-tools.c

@@ -514 +514 @@
 #ifdef __IA64__
     {
-        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
+        mr_asprintf(&mondo_mkisofs_sz, "%s _CD#_", MONDO_MKISOFS_REGULAR_ELILO);
     }
 #else
     {
-        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
+        mr_asprintf(&mondo_mkisofs_sz, "%s _CD#_", MONDO_MKISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(&mondo_mkisofs_sz, "%s _CD#_", MONDO_MKISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {

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

@@ -169 +169 @@
 
 
+#define MONDO_MKISOFS "mkisofs -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V "
 /**
  * @c mkisofs command to generate a nonbootable CD, except for -o option and the directory to image.
  */
-#define MONDO_MKISOFS_NONBOOT   "mkisofs -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
+#define MONDO_MKISOFS_NONBOOT   MONDO_MKISOFS"_CD#_"
 
 /**
  * @c mkisofs command to generate a bootable CD using isolinux, except for -o option and the directory to image.
  */
-#define MONDO_MKISOFS_REGULAR_SYSLINUX  "mkisofs -J -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
+#define MONDO_MKISOFS_REGULAR_SYSLINUX  MONDO_MKISOFS"-J -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 "
 
 /**
  * @c mkisofs command to generate a bootable CD using LILO, except for -o option and the directory to image.
  */
-#define MONDO_MKISOFS_REGULAR_LILO      "mkisofs -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
+#define MONDO_MKISOFS_REGULAR_LILO      MONDO_MKISOFS_REGULAR_SYSLINUX
 
 /**
  * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image.
  */
-// Should replace 8192 by IA64_BOOT_SIZE
-#define MONDO_MKISOFS_REGULAR_ELILO      "mkisofs -no-emul-boot -b images/mindi-bootroot.8192.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
+#define MONDO_MKISOFS_REGULAR_ELILO      MONDO_MKISOFS"-J -no-emul-boot -b images/mindi-bootroot."IA64_BOOT_SIZE".img -c boot.cat "
 
 /**