Changeset 3539 in MondoRescue for branches/3.2/mondo

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

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-archive.c (modified) (3 diffs)
• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (3 diffs)
• include/my-stuff.h (modified) (3 diffs)

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

@@ -1710 +1710 @@
         if (bkpinfo->nonbootable_backup) {
             log_msg(1, "Making nonbootable backup");
-            mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
+            mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS);
             res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
             mr_free(full_isofs_cmd);
@@ -1726 +1726 @@
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO);
+                mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO);
                 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
                 mr_free(full_isofs_cmd);
 #else
                 log_msg(1, "Non-ia64 --> lilo");
-                mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.img -c images/boot.cat -o '_ISO_' -J -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
+                mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.img -c images/boot.cat -o '_ISO_' .",isofs_cmd,MONDO_MKISOFS);
                 // FIXME: fixed boot size probably wrong. lilo to be removed
                 res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
@@ -1742 +1742 @@
                     if (strstr(isofs_cmd,"xorriso")) {
                         /*  xorriso needs another '-' before efi-boot */
-                        mr_asprintf(uefistr, "-%s", MONDO_MKISOFS_UEFI);
+                        mr_asprintf(uefistr, "%s -%s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
                     } else {
-                        mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI);
+                        mr_asprintf(uefistr, "%s %s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
                     }
                 } else {
                     mr_asprintf(uefistr, "%s",MONDO_MKISOFS_CMS);
                 }
-                mr_asprintf(full_isofs_cmd, "%s%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);
+                mr_asprintf(full_isofs_cmd, "%s%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);
                 mr_free(uefistr);
 

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

@@ -3123 +3123 @@
 
     if (bkpinfo->boot_type == UEFI) {
-        /*  hardcoded for now. We can for sure do abetter job here ! */
+        /*  hardcoded for now. We can for sure do a better job here ! */
         /* RHEL, SLES, Mageia, Debian, Ubuntu use grub as boot loader as it seems for UEFI */
         return ('G');

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

@@ -499 +499 @@
 #ifdef __IA64__
     {
-        mr_asprintf(mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_ELILO);
+        mr_asprintf(mondo_mkisofs_sz, "%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_ELILO);
     }
 #else
     {
-        mr_asprintf(mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_LILO);
+        mr_asprintf(mondo_mkisofs_sz, "%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_LILO);
     }
 #endif
@@ -510 +510 @@
                 if (strstr(isofs_cmd,"xorriso")) {
                     /*  xorriso needs another '-' before efi-boot */
-                    mr_asprintf(uefistr, "-%s", MONDO_MKISOFS_UEFI);
+                    mr_asprintf(uefistr, "%s -%s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
                 } else {
-                    mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI);
+                    mr_asprintf(uefistr, "%s %s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
                 }
             } else {
@@ -518 +518 @@
             }
 
-            mr_asprintf(mondo_mkisofs_sz, "%s%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);
+            mr_asprintf(mondo_mkisofs_sz, "%s%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);
         }
         mr_free(isofs_cmd);

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