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

Timestamp:

Mar 22, 2016, 1:50:08 AM (8 years ago)

Author:

Bruno Cornec

Message:

• Review of mkisofs options to mimic what mindi now does and generation is now identical for UEFI
• Image still not seen as bootable for the server

File:

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

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

@@ -179 +179 @@
 #define MONDO_GENISOIMAGE_CMD "genisoimage"
 #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_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
+#define MONDO_MKISOFS " -J -r -v -p MondoRescue -publisher http://www.mondorescue.org -A MondoRescue -V _CD#_ "
+#define MONDO_MKISOFS_CMS " -b syslinux/isolinux.bin -c syslinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "
+#define MONDO_UEFI_PREFIX " -b EFI/isolinux.bin -c EFI/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot "
+#define MONDO_MKISOFS_UEFI " -efi-boot images/mindi-bootroot.img -no-emul-boot "
 
 /**
  * @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 "
+#define MONDO_MKISOFS_REGULAR_SYSLINUX  MONDO_MKISOFS
 
 /**
@@ -197 +197 @@
  * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image.
  */
-#define MONDO_MKISOFS_REGULAR_ELILO      MONDO_MKISOFS"-J -no-emul-boot -b images/mindi-bootroot.img -c images/boot.cat "
+#define MONDO_MKISOFS_REGULAR_ELILO      MONDO_MKISOFS"-no-emul-boot -b images/mindi-bootroot.img -c images/boot.cat "
 
 /**
@@ -207 +207 @@
  * @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 "MONDO_MKISOFS_REGULAR_SYSLINUX" -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_SYSLINUX
 
 /**
  * @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 "MONDO_MKISOFS_REGULAR_ELILO" -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_ELILO
 
 /**
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
      */
-#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs "MONDO_MKISOFS_REGULAR_SYSLINUX" -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs "MONDO_MKISOFS_REGULAR_SYSLINUX
 
 /**
  * @c growisofs command to generate a nonbootable DVD, except for the directory to image.
  */
-#define MONDO_GROWISOFS_NONBOOT          "growisofs -use-the-force-luke -J "MONDO_MKISOFS" -V _CD#_ -v"
+#define MONDO_GROWISOFS_NONBOOT          "growisofs -use-the-force-luke "MONDO_MKISOFS
 
 /**