Changeset 3514 in MondoRescue for branches/3.2/mondo/src/include/my-stuff.h

Timestamp:

Feb 17, 2016, 2:22:11 AM (8 years ago)

Author:

Bruno Cornec

Message:

• Fixes xorriso usage and options differences wrt genisoimage
• Improve temporary file removal, by adding star file to the list, and
• Try to fix #784 by not comparing result of mkstmp to NULL

File:

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

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

@@ -180 +180 @@
 #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 "
+#define MONDO_MKISOFS_CMS " -b syslinux/isolinux.bin -c syslinux/boot.cat -boot-load-size 4 "
+#define MONDO_UEFI_SUFFIX " -b EFI/isolinux.bin -c EFI/boot.cat -boot-load-size 4 -eltorito-alt-boot "
+#define MONDO_MKISOFS_UEFI "-efi-boot images/mindi-bootroot.img -no-emul-boot "MONDO_UEFI_SUFFIX
 
 /**
  * @c mkisofs command to generate a bootable CD using isolinux, except for -o option and the directory to image.
  */
-#define MONDO_MKISOFS_REGULAR_SYSLINUX  MONDO_MKISOFS"-J -boot-info-table -no-emul-boot -b syslinux/isolinux.bin -c syslinux/boot.cat -boot-load-size 4 "
+#define MONDO_MKISOFS_REGULAR_SYSLINUX  MONDO_MKISOFS"-J -boot-info-table -no-emul-boot "
 
 /**
@@ -216 +217 @@
  * @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 "MONDO_MKISOFS" -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs "MONDO_MKISOFS_REGULAR_SYSLINUX" -V _CD#_ -v"
 
 /**