Changeset 2848 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-archive.c

Timestamp:

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

Author:

Bruno Cornec

Message:

• Really support both mkisofs and genisoimage everywhere

File:

• branches/2.2.9/mondo/src/common/libmondo-archive.c (modified) (3 diffs)

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);