Changeset 3514 in MondoRescue for branches/3.2/mondo/src/common/libmondo-archive.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-archive.c (modified) (2 diffs)

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

@@ -1745 +1745 @@
                 if (bkpinfo->boot_type == UEFI) {
                     if (strstr(isofs_cmd,"xorriso")) {
-                        mr_asprintf(uefistr, "%s", MONDO_XORRISO_UEFI);
+                        /*  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, " ");
+                    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);
@@ -2955 +2956 @@
 
     mr_asprintf(dir, "%s/archives", d);
-    mr_asprintf(tmp, "find %s -name '*.afio*' -o -name '*.star.' -exec rm -f '{}' \\;", dir);
+    mr_asprintf(tmp, "find %s -name '*.afio.*' -o -name '*.star.*' -exec rm -f '{}' \\;", dir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);