Changeset 3514 in MondoRescue for branches/3.2

Timestamp:

Feb 17, 2016, 2:22:11 AM (9 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

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-archive.c (modified) (2 diffs)
• common/libmondo-tools.c (modified) (3 diffs)
• include/my-stuff.h (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);

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

branches/3.2/mondo/src/include/my-stuff.h

@@ -180 +180 @@
 #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_UEFI " -eltorito-alt-boot -efi-boot images/mindi-bootroot.img -no-emul-boot "
-#define MONDO_XORRISO_UEFI " -eltorito-alt-boot --efi-boot images/mindi-bootroot.img -no-emul-boot "
+#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
 
 /**
  * @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 -b syslinux/isolinux.bin -c syslinux/boot.cat -boot-load-size 4 "
+#define MONDO_MKISOFS_REGULAR_SYSLINUX  MONDO_MKISOFS"-J -boot-info-table -no-emul-boot "
 
 /**
@@ -216 +217 @@
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
      */
-#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b syslinux/isolinux.bin -c syslinux/boot.cat -J "MONDO_MKISOFS" -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs "MONDO_MKISOFS_REGULAR_SYSLINUX" -V _CD#_ -v"
 
 /**