Changeset 3539 in MondoRescue for branches/3.2/mondo/src/common/libmondo-tools.c

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/common/libmondo-tools.c (modified) (3 diffs)

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);