Changeset 2627 in MondoRescue for branches/2.2.9/mondo/src

Timestamp:

May 4, 2010, 9:59:19 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3946@localhost: bruno | 2010-05-04 19:17:51 +0200

• Solves an issue with usage of -V option in mkiofs wrongly placed

Location:

branches/2.2.9/mondo/src

Files:

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

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

@@ -1842 +1842 @@
         if (bkpinfo->nonbootable_backup) {
             log_msg(1, "Making nonbootable backup");
-// FIXME --- change mkisofs string to MONDO_MKISOFS_NONBOOTABLE and add ' .' at end
-            res =
-                eval_call_to_make_ISO("mkisofs -o '_ISO_' -r -p MondoRescue -publisher www.mondorescue.org -A MondoRescue_GPL -V _CD#_ .",
+            res = eval_call_to_make_ISO(MONDO_MKISOFS"-o '_ISO_' -V _CD#_ .",
                                       destfile, g_current_media_number,
                                       MONDO_LOGFILE, message_to_screen);
@@ -1861 +1859 @@
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_ELILO"-o '_ISO_' _CD#_ .",
+                res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_ELILO"-o '_ISO_' -V _CD#_ .",
                                             destfile,
                                             g_current_media_number,
@@ -1870 +1868 @@
                 res =
                     // 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#_ .",
+                    eval_call_to_make_ISO(MONDO_MKISOFS"-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .",
                                           destfile, g_current_media_number,
                                           MONDO_LOGFILE,
@@ -1879 +1877 @@
                 log_msg(1, "Isolinux");
                 res =
-                    eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_SYSLINUX"-o '_ISO_' _CD#_ .",
+                    eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_SYSLINUX"-o '_ISO_' -V _CD#_ .",
                                           destfile, g_current_media_number,
                                           MONDO_LOGFILE,

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

@@ -505 +505 @@
         }
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS);
         } else if
 #ifdef __FreeBSD__
@@ -514 +514 @@
 #ifdef __IA64__
     {
-        mr_asprintf(&mondo_mkisofs_sz, "%s _CD#_", MONDO_MKISOFS_REGULAR_ELILO);
+        mr_asprintf(&mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_ELILO);
     }
 #else
     {
-        mr_asprintf(&mondo_mkisofs_sz, "%s _CD#_", MONDO_MKISOFS_REGULAR_LILO);
+        mr_asprintf(&mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            mr_asprintf(&mondo_mkisofs_sz, "%s _CD#_", MONDO_MKISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(&mondo_mkisofs_sz, "%s -V _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   MONDO_MKISOFS"_CD#_"
+#define MONDO_MKISOFS "mkisofs -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version "
 
 /**