Changeset 2848 in MondoRescue

Timestamp:

Jul 6, 2011, 2:06:34 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Really support both mkisofs and genisoimage everywhere

Location:

branches/2.2.9

Files:

• mondo-doc/mondorescue-howto.sgml (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (3 diffs)
• mondo/src/common/libmondo-tools.c (modified) (4 diffs)
• mondo/src/include/my-stuff.h (modified) (1 diff)

branches/2.2.9/mondo-doc/mondorescue-howto.sgml

@@ -938 +938 @@
 page</ulink> for details.</para>
 <para>Mondo requires afio, bzip2, cdrtools/cdrecord/growisofs (may be part of the dvd+rw-tools package), ncurses, newt,
-isolinux/syslinux, lzo (optional), lzop (optional), mkisofs, slang,
+        isolinux/syslinux, lzo (optional), lzop (optional), mkisofs/genisoimage, slang,
 and a few other packages.</para>
 <para>Good Linux distributions provide all these packages. If yours

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

@@ -1680 +1680 @@
     char *tmp2;
     char *tmp3;
+    char *isofs_cmd = NULL;
+    char *full_isofs_cmd = NULL;
     char *mds = NULL;
     bool cd_is_mountable;
@@ -1841 +1843 @@
         mr_asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ", mds,  g_current_media_number);
         mr_free(mds);
+        if (find_home_of_exe("genisoimage")) {
+            mr_asprintf(&isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
+        } else {
+            mr_asprintf(&isofs_cmd, "%s", MONDO_MKISOFS_CMD);
+        }
         if (bkpinfo->nonbootable_backup) {
             log_msg(1, "Making nonbootable backup");
-            res = eval_call_to_make_ISO(MONDO_MKISOFS"-o '_ISO_' -V _CD#_ .",
+            mr_asprintf(&full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
+            res = eval_call_to_make_ISO(full_isofs_cmd,
                                       destfile, g_current_media_number,
                                       MONDO_LOGFILE, message_to_screen);
+            mr_free(full_isofs_cmd);
         } else {
             log_msg(1, "Making bootable backup");
@@ -1860 +1869 @@
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_ELILO"-o '_ISO_' -V _CD#_ .",
+                mr_asprintf(&full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO);
+                res = eval_call_to_make_ISO(full_isofs_cmd,
                                             destfile,
                                             g_current_media_number,
                                             MONDO_LOGFILE,
                                             message_to_screen);
+                mr_free(full_isofs_cmd);
 #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);
                 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 -V _CD#_ .",
+                    eval_call_to_make_ISO(full_isofs_cmd,
                                           destfile, g_current_media_number,
                                           MONDO_LOGFILE,
                                           message_to_screen);
+                mr_free(full_isofs_cmd);
 #endif
             } else {
                 log_msg(1, "make_cd_use_lilo = FALSE");
                 log_msg(1, "Isolinux");
+                mr_asprintf(&full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX);
                 res =
-                    eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_SYSLINUX"-o '_ISO_' -V _CD#_ .",
+                    eval_call_to_make_ISO(full_isofs_cmd,
                                           destfile, g_current_media_number,
                                           MONDO_LOGFILE,
                                           message_to_screen);
+                mr_free(full_isofs_cmd);
             }
         }
+        mr_free(isofs_cmd);
         paranoid_free(message_to_screen);
 

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

@@ -331 +331 @@
 #endif
 }
-
 
 /**
@@ -371 +370 @@
     char *mtpt;
     char *hostname;
+    char *isofs_cmd = NULL;
     char *ip_address = NULL;
     int retval = 0;
@@ -508 +508 @@
             fatal_error("Please install either cdrecord or dvdrecord.");
         }
+        if (find_home_of_exe("genisoimage")) {
+            mr_asprintf(&isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
+        } else {
+            mr_asprintf(&isofs_cmd, "%s", MONDO_MKISOFS_CMD);
+        }
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS);
+            mr_asprintf(&mondo_mkisofs_sz, "%s%s", isofs_cmd, MONDO_MKISOFS);
         } else if
 #ifdef __FreeBSD__
@@ -518 +523 @@
 #ifdef __IA64__
     {
-        mr_asprintf(&mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_ELILO);
+        mr_asprintf(&mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_ELILO);
     }
 #else
     {
-        mr_asprintf(&mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_LILO);
+        mr_asprintf(&mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            mr_asprintf(&mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_SYSLINUX);
-        }
+            mr_asprintf(&mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX);
+        }
+        mr_free(isofs_cmd);
+
         if (bkpinfo->manual_cd_tray) {
             if (bkpinfo->call_before_iso[0] == '\0') {

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 "
+#define MONDO_MKISOFS_CMD "mkisofs"
+#define MONDO_GENISOIMAGE_CMD "genisoimage"
+#define MONDO_MKISOFS " -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version "
 
 /**