Changeset 1451 in MondoRescue for branches

Timestamp:

May 20, 2007, 10:53:34 PM (17 years ago)

Author:

Bruno Cornec

Message:

Attempt to fix #117 (all paritions are now looked at if no grub or lilo found in MBR)

Location:

branches/2.2.4/mondo/src

Files:

• common/libmondo-devices.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

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

@@ -2801 +2801 @@
         return ('G');
     } else {
-        log_it("Unknown boot loader");
-        return ('U');
+        // We need to look on each partition then
+        sprintf(list_drives_cmd,
+            "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");
+            paranoid_free(list_drives_cmd);
+            paranoid_free(current_drive);
+            return ('\0');
+        }
+        for (fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
+            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(list_drives_cmd);
+        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');
+        }
     }
 }

branches/2.2.4/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -846 +846 @@
 
 if (!strcmp(mpt, "/1")) {
-strcpy(mountpoint, "/");
-log_msg(3, "Mommm! SME is being a dildo!");
+    strcpy(mountpoint, "/");
+    log_msg(3, "Mommm! SME is being a dildo!");
 } else {
-strcpy(mountpoint, mpt);
+    strcpy(mountpoint, mpt);
 }
 
 if (!strcmp(mountpoint, "lvm")) {
-return (0);
+    return (0);
 }
 if (!strcmp(mountpoint, "image")) {
-return (0);
+    return (0);
 }
 sprintf(tmp, "Mounting device %s   ", device);
 log_msg(1, tmp);
 if (writeable) {
-strcpy(additional_parameters, "-o rw");
+    strcpy(additional_parameters, "-o rw");
 } else {
-strcpy(additional_parameters, "-o ro");
+    strcpy(additional_parameters, "-o ro");
 }
 if (find_home_of_exe("setfattr")) {
-strcat(additional_parameters, ",user_xattr");
+    strcat(additional_parameters, ",user_xattr");
 }
 if (find_home_of_exe("setfacl")) {
-strcat(additional_parameters, ",acl");
+    strcat(additional_parameters, ",acl");
 }
 
 if (!strcmp(mountpoint, "swap")) {
-sprintf(command, "swapon %s", device);
+    sprintf(command, "swapon %s", device);
 } else {
 if (!strcmp(mountpoint, "/")) {
@@ -888 +888 @@
 res = run_program_and_log_output(command, TRUE);
 if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
-log_msg(1, "Re-trying without the fancy extra parameters");
-sprintf(command, "mount -t %s %s %s 2>> %s", format, device,
+    log_msg(1, "Re-trying without the fancy extra parameters");
+    sprintf(command, "mount -t %s %s %s 2>> %s", format, device,
         mountdir, MONDO_LOGFILE);
-res = run_program_and_log_output(command, TRUE);
+    res = run_program_and_log_output(command, TRUE);
 }
 if (res) {
-log_msg(1, "Unable to mount device %s (type %s) at %s", device,
+    log_msg(1, "Unable to mount device %s (type %s) at %s", device,
         format, mountdir);
-log_msg(1, "command was '%s'", command);
-if (!strcmp(mountpoint, "swap")) {
-    log_to_screen(tmp);
-} else {
-    log_msg(2, "Retrying w/o the '-t' switch");
-    sprintf(command, "mount %s %s 2>> %s", device, mountdir,
+    log_msg(1, "command was '%s'", command);
+    if (!strcmp(mountpoint, "swap")) {
+        log_to_screen(tmp);
+    } else {
+        log_msg(2, "Retrying w/o the '-t' switch");
+        sprintf(command, "mount %s %s 2>> %s", device, mountdir,
             MONDO_LOGFILE);
-    log_msg(2, "2nd command = '%s'", command);
-    res = run_program_and_log_output(command, TRUE);
-    if (res == 0) {
-        log_msg(1,
+        log_msg(2, "2nd command = '%s'", command);
+        res = run_program_and_log_output(command, TRUE);
+        if (res == 0) {
+            log_msg(1,
                 "That's OK. I called mount w/o a filesystem type and it worked fine in the end.");
-    } else {
-        log_to_screen(tmp);
-    }
-}
+        } else {
+            log_to_screen(tmp);
+        }
+    }
 }
 if (res && !strcmp(mountpoint, "swap")) {
-log_msg(2, "That's ok. It's just a swap partition.");
-log_msg(2, "Non-fatal error. Returning 0.");
-res = 0;
+    log_msg(2, "That's ok. It's just a swap partition.");
+    log_msg(2, "Non-fatal error. Returning 0.");
+    res = 0;
 }