Changeset 3505 in MondoRescue for branches/3.2/mondo/src/common/libmondo-archive.c

Timestamp:

Feb 12, 2016, 4:12:26 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Should fix errors when used with xorriso and UEFI (option efi-boot should have -- in that case not -)

File:

• branches/3.2/mondo/src/common/libmondo-archive.c (modified) (2 diffs)

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

@@ -1707 +1707 @@
         if (find_home_of_exe("xorriso")) {
             mr_asprintf(isofs_cmd, "%s", MONDO_XORRISO_CMD);
-        else if (find_home_of_exe("genisoimage")) {
+        } else if (find_home_of_exe("genisoimage")) {
             mr_asprintf(isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
         } else {
@@ -1744 +1744 @@
                 log_msg(1, "Isolinux");
                 if (bkpinfo->boot_type == UEFI) {
-                    mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI);
+                    if (strstr(isofs_cmd,"xorriso")) {
+                        mr_asprintf(uefistr, "%s", MONDO_XORRISO_UEFI);
+                    } else {
+                        mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI);
+                    }
                 } else {
                     mr_asprintf(uefistr, " ");