Changeset 3379 in MondoRescue for branches/3.2/mondo/src/common/libmondo-devices.c

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

File:

• branches/3.2/mondo/src/common/libmondo-devices.c (modified) (1 diff)

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