Changeset 3379 in MondoRescue

Timestamp:

May 6, 2015, 11:43:08 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix GRUB detection issu on UEFI based systems
• Initialize Boot type for non interactive setup as well
• Syntax fix

Location:

branches/3.2/mondo/src/common

Files:

• libmondo-archive.c (modified) (2 diffs)
• libmondo-cli.c (modified) (1 diff)
• libmondo-devices.c (modified) (1 diff)

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

@@ -406 +406 @@
 #ifdef DVDRWFORMAT
         if (!find_home_of_exe("dvd+rw-format")) {
-            fatal_error
-                ("Cannot find dvd+rw-format. Please install it or fix your PATH.");
+            fatal_error("Cannot find dvd+rw-format. Please install it or fix your PATH.");
         }
 #endif
         if (!find_home_of_exe("growisofs")) {
-            fatal_error
-                ("Cannot find growisofs. Please install it or fix your PATH.");
+            fatal_error("Cannot find growisofs. Please install it or fix your PATH.");
         }
     }
@@ -669 +667 @@
         if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg")) && (!does_file_exist("/boot/grub2/grub.cfg"))) {
             /* if UEFI then search under /boot/efi */
-            mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("find /boot/efi -name grub.conf");
+            mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("find /boot/efi -name grub.conf"));
             if (strstr(tmp, "grub.conf") == NULL) {
                 mr_free(bootldr_str);

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

@@ -99 +99 @@
         }
     }
+    bkpinfo->boot_type = mr_boot_type();
 
     return (retval);

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

@@ -415 +415 @@
     assert_string_is_neither_NULL_nor_zerolength(str);
 
-    /* For UEFI detection, this should be extended to count=2 */
-    mr_asprintf(command, "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null", dev, str);
+    /* For UEFI detection, this should be extended to count=1000 ! */
+    if (bkpinfo->boot_type == UEFI) {
+        mr_asprintf(command, "dd if=%s bs=446 count=1000 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null", dev, str);
+    } else {
+        mr_asprintf(command, "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null", dev, str);
+    }
     i = system(command);
     mr_free(command);