Changeset 2988 in MondoRescue

Timestamp:

Apr 4, 2012, 2:26:46 PM (12 years ago)

Author:

Bruno Cornec

Message:

r4625@localhost: bruno | 2012-03-30 10:37:17 +0200

• Fix #595 (MD core dump issue) by removing an abusive mr_free
• Fix #596 again by using correctly the --uuid option and getting the value in an adequate manner

File:

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

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

@@ -566 +566 @@
   char *tmp1 = NULL;
   char *oldmd = NULL;
-  char *bootdevice;
   char *name;
   char *ver;
 
-  malloc_string(bootdevice);
   malloc_string(name);
   malloc_string(ver);
@@ -626 +624 @@
   //   2) grub bootloader < v1 is used.
   // Otherwise it won't boot which is bad.
-    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);
@@ -640 +635 @@
         if ((strstr(ver, "GRUB 0.9") != NULL) && (strcmp(raidlist->el[i].raid_device,device) == 0)) {
             mr_asprintf(&oldmd, "-e 0.90");
-            log_it("Forcing old metadata 0.90 for md on %s for old GRUB", device);
+            log_it("Forcing old metadata (%s) for md on %s for old GRUB", oldmd, device);
         } else {
             mr_asprintf(&oldmd, "");
@@ -646 +641 @@
     } else if ((strcmp(name,"LILO") == 0) && (strcmp(raidlist->el[i].raid_device,device) == 0)) {
         mr_asprintf(&oldmd, "-e 0.90");
-        log_it("Forcing old metadata 0.90 for md on %s for LILO", device);
+        log_it("Forcing old metadata (%s) for md on %s for LILO", oldmd, device);
     } else {
         mr_asprintf(&oldmd, "");
     }
-    mr_free(device);
     mr_free(name);
     mr_free(ver);
@@ -660 +654 @@
         log_msg(4, "cmd built: %s", program);
   // Restoring the UUID stored at backup time of present
-  for (v = 0; v++ ; v <= raidlist->el[i].additional_vars.entries) {
+  for (v = 0; v <= raidlist->el[i].additional_vars.entries ; v++ ) {
     if ((raidlist->el[i].additional_vars.el[v].label != NULL) && (strcmp(raidlist->el[i].additional_vars.el[v].label,"UUID") == 0)) {
         // We have a UUID to handle
@@ -666 +660 @@
             // 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);
+            mr_strcat(program, " --uuid %s",raidlist->el[i].additional_vars.el[v].value);
             break;
         } else {