Changeset 1903 in MondoRescue for branches/stable/mondo/src/mondorestore/mondorestore.c

Timestamp:

Apr 10, 2008, 1:13:58 AM (16 years ago)

Author:

Bruno Cornec

Message:

merge -r 1842:1889 2.2.5

File:

• branches/stable/mondo/src/mondorestore/mondorestore.c (modified) (8 diffs)

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

@@ -437 +437 @@
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
     iamhere("Done loading config file; resizing ML");
-    if (bkpinfo->backup_media_type != usb) {
+    if (bkpinfo->backup_media_type == nfs) {
         mr_asprintf(&tmp,bkpinfo->prefix);
         if (popup_and_get_string
@@ -1994 +1994 @@
                        _("Please wait. This may take some time."),
                        "", total_slices);
-    for (bigfileno = 0, finished = FALSE; !finished;) {
+    for (bigfileno = 0 ; bigfileno < noof_biggiefiles ;) {
         mr_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
         if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
@@ -2004 +2004 @@
                     g_current_media_number);
             mr_msg(3, "Slicename would have been %s",
-                    slice_fname(bigfileno + 1, 0, ARCHIVES_PATH, ""));
+                    slice_fname(bigfileno, 0, ARCHIVES_PATH, ""));
             // I'm not positive 'just_changed_cds' is even necessary...
             if (just_changed_cds) {
@@ -2017 +2017 @@
                 just_changed_cds = TRUE;
             } else {
+                /* That big file doesn't exist, but the followings may */
+                /* So we need to continue looping */
                 mr_msg(2, "There was no bigfile #%ld. That's OK.",
-                        bigfileno + 1);
+                    bigfileno + 1);
                 mr_msg(2, "I'm going to stop restoring bigfiles now.");
-                finished = TRUE;
+                retval++;
+                bigfileno++;
             }
         } else {
@@ -3012 +3015 @@
     }
 
+    if (argc == 3 && strcmp(argv[1], "-K") == 0) {
+        g_loglevel = atoi(argv[2]);
+        log_msg(1,"Loglevel forced to %s",g_loglevel);
+    }
 
     if (argc == 2 && strcmp(argv[1], "--live-grub") == 0) {
@@ -3169 +3176 @@
             mvaddstr_and_log_it(g_currentY++,
                                 0,
-                                _("Run complete. Please remove CD/media and reboot."));
+                                _("Run complete. Please remove media and reboot."));
         } else {
             run_program_and_log_output("sync", FALSE);
@@ -3226 +3233 @@
     unlink("/tmp/mondo-run-prog.tmp");
     set_signals(FALSE);
-    mr_asprintf(&tmp, "rm -Rf %s", bkpinfo->tmpdir);
-    run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
 
     log_to_screen
@@ -3243 +3247 @@
         run_program_and_log_output("mount / -o remount,rw", 2);
     }                           // for b0rken distros
+    mr_asprintf(&tmp, "rm -Rf %s", bkpinfo->tmpdir);
+    run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
+
     paranoid_MR_finish(retval); // frees global stuff plus bkpinfo
     free_libmondo_global_strings(); // it's fine to have this here :) really :)