Changeset 3665 in MondoRescue for branches

Timestamp:

Jun 6, 2017, 8:20:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix a bug when burning directly media to take back boot params (the recent changes in boot options management was only done for ISO images, not for physical media burnt).

File:

• branches/3.3/mondo/src/common/libmondo-tools.c (modified) (4 diffs)

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

@@ -314 +314 @@
 }
 
+/*  compute the final options for bootable media, considering the comand and the boot type */
+char *mr_compute_uefi_string(char *isofs_cmd) {
+
+    char *uefistr = NULL;
+    char *mondo_mkisofs_sz = NULL;
+
+    /*  real media */
+    if (strstr(isofs_cmd,"growisofs")) {
+        mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
+    } else {
+        /*  iso image */
+        if (bkpinfo->boot_type == UEFI) {
+            if (strstr(isofs_cmd,"xorriso")) {
+                /*  xorriso needs another '-' before efi-boot */
+                mr_asprintf(uefistr, "%s -%s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
+            } else {
+                mr_asprintf(uefistr, "%s %s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
+            }
+        } else {
+            mr_asprintf(uefistr, "%s",MONDO_MKISOFS_CMS);
+        }
+        mr_asprintf(mondo_mkisofs_sz, "%s%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX, uefistr);
+    }
+
+    return(mondo_mkisofs_sz);
+}
+
 /**
  * Finish configuring the backup information structure. Call this function
@@ -359 +386 @@
     char *iso_tmp = NULL;
     char *iso_dir = NULL;
-    char *uefistr = NULL;
 
     assert(bkpinfo != NULL);
@@ -439 +465 @@
 #endif
         else {
-            mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
+            mondo_mkisofs_sz = mr_compute_uefi_string(cdr_exe);
         }
         if (bkpinfo->manual_cd_tray) {
@@ -507 +533 @@
 #endif
         else {
-            if (bkpinfo->boot_type == UEFI) {
-                if (strstr(isofs_cmd,"xorriso")) {
-                    /*  xorriso needs another '-' before efi-boot */
-                    mr_asprintf(uefistr, "%s -%s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
-                } else {
-                    mr_asprintf(uefistr, "%s %s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
-                }
-            } else {
-                mr_asprintf(uefistr, "%s",MONDO_MKISOFS_CMS);
-            }
-
-            mr_asprintf(mondo_mkisofs_sz, "%s%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);
+                mondo_mkisofs_sz = mr_compute_uefi_string(isofs_cmd);
         }
         mr_free(isofs_cmd);