Changeset 1252 in MondoRescue

Timestamp:

Mar 20, 2007, 11:48:46 AM (18 years ago)

Author:

Bruno Cornec

Message:

MDSTAT_FILE is used everywhere (replacing /proc/mdstat strings)

Location:

branches/stable/mondo/src

Files:

• common/libmondo-raid.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (1 diff)
• mondorestore/mondo-rstr-newt.c (modified) (1 diff)

branches/stable/mondo/src/common/libmondo-raid.c

@@ -53 +53 @@
     if (raidno == -1) {
         mr_asprintf(&command,
-                 "grep \"linear\" /proc/mdstat > /dev/null 2> /dev/null");
+                 "grep \"linear\" %s > /dev/null 2> /dev/null", MDSTAT_FILE);
     } else {
         mr_asprintf(&command,
-                 "grep \"raid%d\" /proc/mdstat > /dev/null 2> /dev/null",
-                 raidno);
+                 "grep \"raid%d\" %s > /dev/null 2> /dev/null",
+                 raidno, MDSTAT_FILE);
     }
     log_it("Is raid %d registered? Command = '%s'", raidno, command);

branches/stable/mondo/src/common/libmondo-tools.c

@@ -981 +981 @@
         && !does_file_exist("/etc/raidtab")) {
         log_to_screen
-            (_("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat"));
+            (_("You have RAID partitions but no /etc/raidtab - creating one from "MDSTAT_FILE));
         create_raidtab_from_mdstat("/etc/raidtab");
     }

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

@@ -2185 +2185 @@
         }
 #else
-        fin = fopen("/proc/mdstat", "r");
+        fin = fopen(MDSTAT_FILE, "r");
         if (!fin) {
-            log_OS_error("/proc/mdstat");
+            log_OS_error(MDSTAT_FILE);
             return (1);
         }

branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -549 +549 @@
     malloc_string(tmp);
     assert(raidrec != NULL);
-    system
-        ("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
+    mr_asprintf(&tmp,"grep Pers %s > /tmp/raid-personalities.txt 2> /dev/null", MDSTAT_FILE);
+    system(tmp);
+    mr_free(tmp);
     mr_asprintf(&personalities,
            last_line_of_file("/tmp/raid-personalities.txt"));