Changeset 2848 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-tools.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-tools.c (modified) (4 diffs)

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') {