Changeset 2982 in MondoRescue for branches/3.0/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

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

Author:

Bruno Cornec

Message:

r4605@localhost: bruno | 2012-03-29 15:44:39 +0200

• change create_raidtab_from_mdstat and parse_mdstat to have an additional parameter being the location of the /proc/mdstat file
• adds a mkraidtab CLI parameter to test raidtab generation, allowed by the previous feature
• cleanup libmondo-raid.c parse_mdstat function with correct indentation

File:

• branches/3.0/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

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

@@ -2348 +2348 @@
 
 
-void wait_until_software_raids_are_prepped(char *mdstat_file,
-                                           int wait_for_percentage)
+void wait_until_software_raids_are_prepped(char *mdstat_file, int wait_for_percentage)
 {
     struct raidlist_itself *raidlist;
-    int unfinished_mdstat_devices = 9999, i;
+    int unfinished_mdstat_devices = 9999;
+    int i = 0;
     char *screen_message;
 
@@ -2362 +2362 @@
     while (unfinished_mdstat_devices > 0) {
             // FIXME: Prefix '/dev/' should really be dynamic!
-        if (parse_mdstat(raidlist, "/dev/")) {
+        if (parse_mdstat(MDSTAT_FILE, raidlist, "/dev/")) {
             log_to_screen("Sorry, cannot read %s", MDSTAT_FILE);
             log_msg(1,"Sorry, cannot read %s", MDSTAT_FILE);
             return;
         }
-        for (unfinished_mdstat_devices = i = 0; i <= raidlist->entries; i++) {
+        for (unfinished_mdstat_devices = 0; i <= raidlist->entries; i++) {
             if (raidlist->el[i].progress < wait_for_percentage) {
                 unfinished_mdstat_devices++;
@@ -2383 +2383 @@
                     sleep(2);
                     // FIXME: Prefix '/dev/' should really be dynamic!
-                    if (parse_mdstat(raidlist, "/dev/")) {
+                    if (parse_mdstat(MDSTAT_FILE, raidlist, "/dev/")) {
                         break;
                     }