Changeset 3422 in MondoRescue for branches

Timestamp:

Aug 26, 2015, 1:38:00 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Add UEFI support in which_boot_loader (for now always return grub for UEFI boot mode)

File:

• branches/3.2/mondo/src/common/libmondo-devices.c (modified) (3 diffs)

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

@@ -3104 +3104 @@
     /*@ end vars *************************************************** */
 
-    malloc_string(current_drive);
-
-    /* UEFI is not supported here - but should be managed as a BIOS/UEFI option not a Boot Loader one per se */
-
 #ifdef __IA64__
     /* No choice for it */
     return ('E');
 #endif
+    if (bkpinfo->boot_type == EFI) {
+        /* No choice for it */
+        return ('E');
+    }
+
+    if (bkpinfo->boot_type == UEFI) {
+        /*  hardcoded for now. We can for sure do abetter job here ! */
+        /* RHEL, SLES, Mageia, Debian, Ubuntu use grub as boot loader as it seems for UEFI */
+        return ('G');
+    }
+
     assert(which_device != NULL);
 
@@ -3120 +3127 @@
         log_OS_error("Unable to open list of drives");
         mr_free(list_drives_cmd);
-        paranoid_free(current_drive);
         return ('\0');
     }
     mr_free(list_drives_cmd);
 
-    for (tmp = fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives) && (tmp != NULL);
-         tmp = fgets(current_drive, MAX_STR_LEN, pdrives)) {
-        strip_spaces(current_drive);
-        log_it("looking at drive %s's MBR", current_drive);
-        if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
-            count_grubs++;
-            strcpy(which_device, current_drive);
-            break;
-        }
-        if (does_string_exist_in_boot_block(current_drive, "LILO")) {
-            count_lilos++;
-            strcpy(which_device, current_drive);
-            break;
-        }
-    }
-    if (pclose(pdrives)) {
-        log_OS_error("Cannot pclose pdrives");
-    }
-    log_it("%d grubs and %d lilos\n", count_grubs, count_lilos);
-    if (count_grubs && !count_lilos) {
-        paranoid_free(current_drive);
-        return ('G');
-    } else if (count_lilos && !count_grubs) {
-        paranoid_free(current_drive);
-        return ('L');
-    } else if (count_grubs == 1 && count_lilos == 1) {
-        log_it("I'll bet you used to use LILO but switched to GRUB...");
-        paranoid_free(current_drive);
-        return ('G');
-    } else {
-        // We need to look on each partition then
-        mr_asprintf(list_drives_cmd, "mr-parted2fdisk -l 2>/dev/null | grep -E \"^/dev/\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/");
-        log_it("list_drives_cmd = %s", list_drives_cmd);
-
-        if (!(pdrives = popen(list_drives_cmd, "r"))) {
-            log_OS_error("Unable to open list of drives");
-            mr_free(list_drives_cmd);
-            paranoid_free(current_drive);
-            return ('\0');
-        }
-        mr_free(list_drives_cmd);
-
-        for (tmp = fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives) && (tmp != NULL);
-            tmp = fgets(current_drive, MAX_STR_LEN, pdrives)) {
+    malloc_string(current_drive);
+    if (bkpinfo->boot_type == BIOS) {
+        for (tmp = fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives) && (tmp != NULL); tmp = fgets(current_drive, MAX_STR_LEN, pdrives)) {
             strip_spaces(current_drive);
-            log_it("looking at partition %s's BR", current_drive);
+            log_it("looking at drive %s's MBR", current_drive);
             if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
                 count_grubs++;
@@ -3186 +3151 @@
         }
         log_it("%d grubs and %d lilos\n", count_grubs, count_lilos);
-        paranoid_free(current_drive);
         if (count_grubs && !count_lilos) {
+            paranoid_free(current_drive);
             return ('G');
         } else if (count_lilos && !count_grubs) {
+            paranoid_free(current_drive);
             return ('L');
         } else if (count_grubs == 1 && count_lilos == 1) {
             log_it("I'll bet you used to use LILO but switched to GRUB...");
+            paranoid_free(current_drive);
             return ('G');
         } else {
-            log_it("Unknown boot loader");
-            return ('U');
+            // We need to look on each partition then
+            mr_asprintf(list_drives_cmd, "mr-parted2fdisk -l 2>/dev/null | grep -E \"^/dev/\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/");
+            log_it("list_drives_cmd = %s", list_drives_cmd);
+    
+            if (!(pdrives = popen(list_drives_cmd, "r"))) {
+                log_OS_error("Unable to open list of drives");
+                mr_free(list_drives_cmd);
+                paranoid_free(current_drive);
+                return ('\0');
+            }
+            mr_free(list_drives_cmd);
+    
+            for (tmp = fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives) && (tmp != NULL);
+                tmp = fgets(current_drive, MAX_STR_LEN, pdrives)) {
+                strip_spaces(current_drive);
+                log_it("looking at partition %s's BR", current_drive);
+                if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
+                    count_grubs++;
+                    strcpy(which_device, current_drive);
+                    break;
+                }
+                if (does_string_exist_in_boot_block(current_drive, "LILO")) {
+                    count_lilos++;
+                    strcpy(which_device, current_drive);
+                    break;
+                }
+            }
+            if (pclose(pdrives)) {
+                log_OS_error("Cannot pclose pdrives");
+            }
+            log_it("%d grubs and %d lilos\n", count_grubs, count_lilos);
+            paranoid_free(current_drive);
+            if (count_grubs && !count_lilos) {
+                return ('G');
+            } else if (count_lilos && !count_grubs) {
+                return ('L');
+            } else if (count_grubs == 1 && count_lilos == 1) {
+                log_it("I'll bet you used to use LILO but switched to GRUB...");
+                return ('G');
+            } else {
+                log_it("Unknown boot loader");
+                return ('U');
+            }
         }
     }