Changeset 1251 in MondoRescue

Timestamp:

Mar 20, 2007, 11:43:15 AM (18 years ago)

Author:

Bruno Cornec

Message:

wait_until_software_raids_are_prepped function has now only 1 parameter (the other was useless)

Location:

branches/stable/mondo/src

Files:

• common/newt-specific.c (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools-EXT.h (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (2 diffs)

branches/stable/mondo/src/common/newt-specific.c

@@ -1525 +1525 @@
 
 
-void wait_until_software_raids_are_prepped(char *mdstat_file,
-                                           int wait_for_percentage);
+void wait_until_software_raids_are_prepped(int wait_for_percentage);

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

@@ -905 +905 @@
     mr_msg(1, "Creating LVMs");
     if (does_file_exist("/tmp/i-want-my-lvm")) {
-        wait_until_software_raids_are_prepped("/proc/mdstat", 100);
+        wait_until_software_raids_are_prepped(100);
         log_to_screen(_("Configuring LVM"));
         if (!g_text_mode) {

branches/stable/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

@@ -38 +38 @@
 extern void ask_about_these_imagedevs(char *infname, char *outfname);
 
-extern void wait_until_software_raids_are_prepped(char *mdstat_file,
-                                                  int wait_for_percentage);
+extern void wait_until_software_raids_are_prepped(int wait_for_percentage);

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

@@ -2347 +2347 @@
 
 
-void wait_until_software_raids_are_prepped(char *mdstat_file,
-                                           int wait_for_percentage)
+void wait_until_software_raids_are_prepped(int wait_for_percentage)
 {
     struct raidlist_itself *raidlist = NULL;

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

@@ -2688 +2688 @@
 
 
-extern void wait_until_software_raids_are_prepped(char *, int);
+extern void wait_until_software_raids_are_prepped(int);
 
 char which_restore_mode(void);
@@ -2958 +2958 @@
     }
 
-    if (argc == 3 && strcmp(argv[1], "--mdstat") == 0) {
-        wait_until_software_raids_are_prepped(argv[2], 100);
+    if (argc == 2 && strcmp(argv[1], "--mdstat") == 0) {
+        wait_until_software_raids_are_prepped(100);
         finish(0);
     }