Changeset 3502 in MondoRescue for branches/3.2/mondo

Timestamp:

Feb 9, 2016, 2:34:54 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Adds support for xorriso for UEFI distributions using it such as Debian 8

Location:

branches/3.2/mondo/src

Files:

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

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

@@ -1705 +1705 @@
         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")) {
+        if (find_home_of_exe("xorriso")) {
+            mr_asprintf(isofs_cmd, "%s", MONDO_XORRISO_CMD);
+        else if (find_home_of_exe("genisoimage")) {
             mr_asprintf(isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
         } else {

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

@@ -481 +481 @@
             fatal_error("Please install either cdrecord or dvdrecord.");
         }
-        if (find_home_of_exe("genisoimage")) {
+        if (find_home_of_exe("xorriso")) {
+            mr_asprintf(isofs_cmd, "%s", MONDO_XORRISO_CMD);
+        else if (find_home_of_exe("genisoimage")) {
             mr_asprintf(isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
         } else {
@@ -934 +936 @@
 #endif
     retval += whine_if_not_found(MKE2FS_OR_NEWFS);
-    if (system("which genisoimage > /dev/null 2> /dev/null")) {
-        retval += whine_if_not_found("mkisofs");
+    if (system("which xorriso > /dev/null 2> /dev/null")) {
+        if (system("which genisoimage > /dev/null 2> /dev/null")) {
+            retval += whine_if_not_found("mkisofs");
+        }
     }
     if (system("which wodim > /dev/null 2> /dev/null")) {

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

@@ -178 +178 @@
 #define MONDO_MKISOFS_CMD "mkisofs"
 #define MONDO_GENISOIMAGE_CMD "genisoimage"
+#define MONDO_XORRISO_CMD "xorriso"
 #define MONDO_MKISOFS " -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version "
 #define MONDO_MKISOFS_UEFI " -eltorito-alt-boot -efi-boot images/mindi-bootroot.img -no-emul-boot "