Changeset 2991


Ignore:
Timestamp:
Apr 5, 2012, 3:16:10 AM (7 years ago)
Author:
bruno
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/mondo/src/mondorestore/mondo-prep.c

    r2990 r2991  
    586586    // create device list from normal disks followed by spare ones
    587587    if (raidlist->el[i].data_disks.el[0].device != NULL) {
    588     mr_asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
     588        mr_asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
    589589        log_msg(4, "Adding device %s to list", raidlist->el[i].data_disks.el[0].device);
    590590    } else {
     
    626626                log_it("Managing previous UUID %s", raidlist->el[i].additional_vars.el[v].value);
    627627                mr_strcat(program, " --uuid %s",raidlist->el[i].additional_vars.el[v].value);
    628                 break;
     628                continue;
    629629            } else {
    630630                log_msg(1,"Unable to manage previous NULL UUID");
     
    638638                log_it("Managing previous Version %s", raidlist->el[i].additional_vars.el[v].value);
    639639                mr_strcat(program, " -e %s",raidlist->el[i].additional_vars.el[v].value);
    640                 break;
     640                continue;
    641641            } else {
    642642                log_msg(1,"Unable to manage previous NULL Version");
  • branches/3.0/mondo/test/test-mountlist.c

    r2990 r2991  
    9191log_it("before create mdadm dev");
    9292create_raid_device_via_mdadm(raidlist,"/dev/md0",FALSE);
     93create_raid_device_via_mdadm(raidlist,"/dev/md1",FALSE);
    9394log_it("after create mdadm dev");
    9495
     96free(mountlist);
     97free(raidlist);
    9598mr_free(MONDO_LOGFILE);
     99mr_free(g_mountlist_fname);
    96100exit(0);
    97101}
Note: See TracChangeset for help on using the changeset viewer.