Changeset 2984 in MondoRescue for branches/3.0/mondo/src/mondorestore/mondo-prep.c

Timestamp:

Mar 30, 2012, 2:43:31 AM (12 years ago)

Author:

Bruno Cornec

Message:

r4607@localhost: bruno | 2012-03-29 16:54:35 +0200

• Improves create_raid_device_via_mdadm by adding better test of error on conf params setup and also by systematically defining oldmd which wasn't the case for some GRUB cqses, especially when rub commqnd wasn't successful - qs it wasn't launchde chrooted

File:

• branches/3.0/mondo/src/mondorestore/mondo-prep.c (modified) (6 diffs)

branches/3.0/mondo/src/mondorestore/mondo-prep.c

@@ -564 +564 @@
   char *program = NULL;
   char *tmp = NULL;
+  char *tmp1 = NULL;
   char *oldmd = NULL;
   char *bootdevice;
@@ -586 +587 @@
     log_msg(1, "RAID device %s not found in list.", device);
     return 1;
+  } else {
+    log_msg(1, "RAID device %s found in list (%d).", device, i);
   }
+
   // create device list from normal disks followed by spare ones
   mr_asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
@@ -612 +616 @@
   //   2) grub bootloader < v1 is used.
   // Otherwise it won't boot which is bad.
-    read_cfg_var(g_mondo_cfg_file, "bootloader.device", bootdevice);
-    read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
+    if (read_cfg_var(g_mondo_cfg_file, "bootloader.device", bootdevice) != 0) {
+            log_msg(2, "Unable to find bootloader.device param in %s conf file\n", g_mondo_cfg_file);
+    }
+    if (read_cfg_var(g_mondo_cfg_file, "bootloader.name", name) != 0) {
+            log_msg(2, "Unable to find bootloader.name param in %s conf file\n", g_mondo_cfg_file);
+        strcpy(name,"NONE");
+    }
     if (strcmp(name,"GRUB") == 0) {
-        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("grub --version"));
+        mr_asprintf(&tmp1, "chroot %s grub --version", MNT_RESTORING);
+        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(tmp1));
+        mr_free(tmp1);
         if ((strstr(tmp, "GRUB 0.9") != NULL) && (strcmp(raidlist->el[i].raid_device,device) == 0)) {
-            mr_free(oldmd);
             mr_asprintf(&oldmd, "-e 0.90");
             log_it("Forcing old metadata 0.90 for md on %s for old GRUB", device);
+        } else {
+            mr_asprintf(&oldmd, "");
         }
     } else if ((strcmp(name,"LILO") == 0) && (strcmp(raidlist->el[i].raid_device,device) == 0)) {
-        mr_free(oldmd);
         mr_asprintf(&oldmd, "-e 0.90");
         log_it("Forcing old metadata 0.90 for md on %s for LILO", device);
@@ -640 +651 @@
         if (raidlist->el[i].additional_vars.el[v].value != NULL) {
             // force its restoration in order to avoid modifying all conf files using it
+            log_it("Managing previous UUID %s", raidlist->el[i].additional_vars.el[v].value);
             mr_strcat(program, " --update=uuid --uuid %s",raidlist->el[i].additional_vars.el[v].value);
             break;
+        } else {
+            log_it("Unable to manage previous NULL UUID");
         }
     }
@@ -671 +685 @@
   }
   mr_strcat(program, " %s", devices);
+    log_msg(2, "RAID device re-created with the following command:\n%s\n", program);
   res = run_program_and_log_output(program, 1);
   // free memory
@@ -814 +829 @@
         paranoid_free(tmp);
 
-// Shouldn't be necessary.
+        // Shouldn't be necessary.
         log_to_screen("Stopping %s", device);
         stop_raid_device(device);