Changeset 3505 in MondoRescue for branches/3.2

Timestamp:

Feb 12, 2016, 4:12:26 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Should fix errors when used with xorriso and UEFI (option efi-boot should have -- in that case not -)

Location:

branches/3.2

Files:

• mindi/mindi (modified) (3 diffs)
• mondo/src/common/libmondo-archive.c (modified) (2 diffs)
• mondo/src/include/my-stuff.h (modified) (2 diffs)

branches/3.2/mindi/mindi

@@ -115 +115 @@
 # use it if it's available.
 if [ ! -x $ISO_CMD ]; then
-    ISO_CMD=/usr/bin/genisoimage
+    ISO_CMD="/usr/bin/genisoimage"
 fi
 
 # For compatibility with previous versions default to mkisofs
 if [ ! -x $ISO_CMD ]; then
-    ISO_CMD=/usr/bin/mkisofs
+    ISO_CMD="/usr/bin/mkisofs"
 fi
 
@@ -131 +131 @@
     BOOT_TYPE="UEFI"
     ISO_OPT="$ISO_OPT -eltorito-alt-boot -efi-boot images/mindi-bootroot.img -no-emul-boot"
+    if [ "$ISO_CMD" = "/usr/bin/xorriso" ]; then
+        ISO_OPT="$ISO_OPT -eltorito-alt-boot --efi-boot images/mindi-bootroot.img -no-emul-boot"
+    fi
 else
     # Find MBR in case of bootable USB device to build
@@ -1545 +1548 @@
     if [ "$?" -ne "0" ] ; then
         if [ "$BOOT_TYPE" = "UEFI" ]; then
+            CMD=`echo $CMD | perl -p -e 's|--efi-boot |-eltorito-platform 0xEF -eltorito-boot |'`
             CMD=`echo $CMD | perl -p -e 's|-efi-boot |-eltorito-platform 0xEF -eltorito-boot |'`
             $CMD . > /dev/null 2> $MINDI_TMP/mkisofs.log

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

@@ -1707 +1707 @@
         if (find_home_of_exe("xorriso")) {
             mr_asprintf(isofs_cmd, "%s", MONDO_XORRISO_CMD);
-        else if (find_home_of_exe("genisoimage")) {
+        } else if (find_home_of_exe("genisoimage")) {
             mr_asprintf(isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
         } else {
@@ -1744 +1744 @@
                 log_msg(1, "Isolinux");
                 if (bkpinfo->boot_type == UEFI) {
-                    mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI);
+                    if (strstr(isofs_cmd,"xorriso")) {
+                        mr_asprintf(uefistr, "%s", MONDO_XORRISO_UEFI);
+                    } else {
+                        mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI);
+                    }
                 } else {
                     mr_asprintf(uefistr, " ");

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_XORRISO_CMD "xorriso -as mkisofs"
 #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 "
+#define MONDO_XORRISO_UEFI " -eltorito-alt-boot --efi-boot images/mindi-bootroot.img -no-emul-boot "
 
 /**
@@ -205 +206 @@
  * @c growisofs command to generate a bootable DVD using isolinux, except for the directory to image.
  */
-#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b syslinux/isolinux.bin --boot-info-table -c syslinux/boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_SYSLINUX" -V _CD#_ -v"
 
 /**
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
      */
-#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-bootroot.img -c images/boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_ELILO" -V _CD#_ -v"
 
 /**
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
      */
-#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b syslinux/isolinux.bin -c syslinux/boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b syslinux/isolinux.bin -c syslinux/boot.cat -J "MONDO_MKISOFS" -V _CD#_ -v"
 
 /**
  * @c growisofs command to generate a nonbootable DVD, except for the directory to image.
  */
-#define MONDO_GROWISOFS_NONBOOT          "growisofs -use-the-force-luke -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+#define MONDO_GROWISOFS_NONBOOT          "growisofs -use-the-force-luke -J "MONDO_MKISOFS" -V _CD#_ -v"
 
 /**