Changeset 3505 in MondoRescue for branches/3.2/mondo/src/include

Timestamp:

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

Author:

Bruno Cornec

Message:

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

File:

• branches/3.2/mondo/src/include/my-stuff.h (modified) (2 diffs)

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"
 
 /**