Changeset 2991 in MondoRescue

Timestamp:

Apr 5, 2012, 3:16:10 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix #596 for good as well as #473 and #500: now mondorestore will recreate correctly md devices with their original UUIDs and original metadata format.

Location:

branches/3.0/mondo

Files:

• src/mondorestore/mondo-prep.c (modified) (3 diffs)
• test/test-mountlist.c (modified) (1 diff)

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

@@ -586 +586 @@
     // create device list from normal disks followed by spare ones
     if (raidlist->el[i].data_disks.el[0].device != NULL) {
-    mr_asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
+        mr_asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
         log_msg(4, "Adding device %s to list", raidlist->el[i].data_disks.el[0].device);
     } else {
@@ -626 +626 @@
                 log_it("Managing previous UUID %s", raidlist->el[i].additional_vars.el[v].value);
                 mr_strcat(program, " --uuid %s",raidlist->el[i].additional_vars.el[v].value);
-                break;
+                continue;
             } else {
                 log_msg(1,"Unable to manage previous NULL UUID");
@@ -638 +638 @@
                 log_it("Managing previous Version %s", raidlist->el[i].additional_vars.el[v].value);
                 mr_strcat(program, " -e %s",raidlist->el[i].additional_vars.el[v].value);
-                break;
+                continue;
             } else {
                 log_msg(1,"Unable to manage previous NULL Version");

branches/3.0/mondo/test/test-mountlist.c

@@ -91 +91 @@
 log_it("before create mdadm dev");
 create_raid_device_via_mdadm(raidlist,"/dev/md0",FALSE);
+create_raid_device_via_mdadm(raidlist,"/dev/md1",FALSE);
 log_it("after create mdadm dev");
 
+free(mountlist);
+free(raidlist);
 mr_free(MONDO_LOGFILE);
+mr_free(g_mountlist_fname);
 exit(0);
 }