Changeset 3502 in MondoRescue for branches

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

Files:

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

branches/3.2/mindi/mindi

@@ -106 +106 @@
 DEPLIST_DIR="$MINDI_CONF/deplist.d"
 
-ISO_CMD="/usr/bin/mkisofs"
+# Debian 8 system e.g. use xorriso for UEFI support.
+# However, they use exactly the same command line parameters as mkisofs, so just
+# use it if it's available.
+ISO_CMD="/usr/bin/xorriso"
+
+# Mandriva system e.g. use cdrkit, which uses genisoimage.
+# However, they use exactly the same command line parameters as mkisofs, so just
+# use it if it's available.
+if [ ! -x $ISO_CMD ]; then
+    ISO_CMD=/usr/bin/genisoimage
+fi
+
+# For compatibility with previous versions default to mkisofs
+if [ ! -x $ISO_CMD ]; then
+    ISO_CMD=/usr/bin/mkisofs
+fi
+
 ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi"
 
@@ -123 +139 @@
     [ ! -r "$MBRFILE" ] && MBRFILE=/usr/share/lib64/syslinux/mbr.bin
 fi
-
-# Mandriva system e.g. use cdrkit, which uses genisoimage instead of mkisofs.
-# However, they use exactly the same command line parameters, so just
-# use genisoimage if it's available.
-if [ ! -x $ISO_CMD ]; then
-    ISO_CMD=/usr/bin/genisoimage
-fi
-
 
 # Function to log on screen only
@@ -1467 +1475 @@
     local i old_pwd files
     if [ -z "$ISO_CMD" ]; then
-        LogAll "ERROR: Neither mkisofs nor genisoimage found, unable to make CD image"
+        LogAll "ERROR: Neither mkisofs nor genisoimage nor xorriso found, unable to make CD image"
         return
     fi

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

@@ -923 +923 @@
 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/genisoimage, slang,
+        isolinux/syslinux, lzo (optional), lzop (optional), mkisofs/genisoimage/xorriso, slang,
 and a few other packages.</para>
 <para>Good Linux distributions provide all these packages. If yours

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 "