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

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

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

@@ -361 +361 @@
     char *iso_tmp = NULL;
     char *iso_dir = NULL;
+    char *uefistr = NULL;
 
     assert(bkpinfo != NULL);
@@ -505 +506 @@
     }
 #endif
-        else
-        {
-            mr_asprintf(mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX);
+        else {
+            if (bkpinfo->boot_type == UEFI) {
+                if (strstr(isofs_cmd,"xorriso")) {
+                    /*  xorriso needs another '-' before efi-boot */
+                    mr_asprintf(uefistr, "-%s", MONDO_MKISOFS_UEFI);
+                } else {
+                    mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI);
+                }
+            } else {
+                mr_asprintf(uefistr, "%s",MONDO_MKISOFS_CMS);
+            }
+
+            mr_asprintf(mondo_mkisofs_sz, "%s%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);
         }
         mr_free(isofs_cmd);
@@ -670 +681 @@
 char* mkdtemp(char *template)
 {
-    if (mkstemp(template) == NULL) {
+    if (mkstemp(template) == -1) {
         return NULL;
     }