Changeset 561 in MondoRescue for trunk/mondo/mondo/mondorestore/mondo-restore.c

Timestamp:

May 20, 2006, 5:51:21 PM (18 years ago)

Author:

bcornec

Message:

merge -r 542:560 $SVN_M/branches/stable

File:

• trunk/mondo/mondo/mondorestore/mondo-restore.c (modified) (5 diffs)

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -839 +839 @@
                     }
 
-                    fmt_errs = format_everything(mountlist, FALSE);
+                    fmt_errs = format_everything(mountlist, FALSE, raidlist);
                     if (!fmt_errs) {
                         log_to_screen
@@ -857 +857 @@
                 if (ask_me_yes_or_no
                     (_("Do you want to format your hard drives?"))) {
-                    fmt_errs = format_everything(mountlist, TRUE);
+                    fmt_errs = format_everything(mountlist, TRUE, raidlist);
                     if (!fmt_errs) {
                         done = TRUE;
@@ -1164 +1164 @@
                 system("sync");
                 log_to_screen(_("Please wait. This may take a few minutes."));
-                res += format_everything(mountlist, FALSE);
+                res += format_everything(mountlist, FALSE, raidlist);
             }
             paranoid_fclose(g_fprep);
@@ -3425 +3425 @@
     }
 
-    if (argc == 4 && strcmp(argv[1], "--mdconv") == 0) {
-        finish(create_raidtab_from_mdstat(argv[2], argv[3]));
+    if (argc == 3 && strcmp(argv[1], "--mdconv") == 0) {
+        finish(create_raidtab_from_mdstat(argv[2]));
     }
 
@@ -3525 +3525 @@
             strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
             load_mountlist(mountlist, g_mountlist_fname);
-            res = format_everything(mountlist, FALSE);
+            res = format_everything(mountlist, FALSE, raidlist);
             finish(res);
         }