Changeset 2623 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Apr 12, 2010, 3:23:24 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3783@localhost: bruno | 2010-04-11 11:57:27 +0200

• Use MINDI_CACHE for temp file communication between archive/restore
• Remove some now useless globals in mondo
• Remove function get_cfg_file_from_archive_or_bust and get_cfg_file_from_archive
• Adds function get_cfg_file_from_initrd (Not finished)
• Recovery doesn't work in that version atm (checkpoint version)

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (5 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -18 +18 @@
 /* Reference to global bkpinfo */
 extern struct s_bkpinfo *bkpinfo;
-
-extern char *g_mountlist_fname;
 
 //static char cvsid[] = "$Id$";
@@ -352 +350 @@
     assert(bkpinfo != NULL);
     mvaddstr_and_log_it(g_currentY, 0, "Comparing archives");
-    tmp = read_cfg_var(g_mondo_cfg_file, "last-filelist-number");
+    tmp = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "last-filelist-number");
     max_val = atol(tmp);
     mr_free(tmp);
@@ -523 +521 @@
 
   /**************************************************************************
-   * also deletes tmp/filelist.full & tmp/biggielist.txt _and_ tries to     *
+   * also deletes tmp/filelist.full & biggielist.txt _and_ tries to     *
    * restore them from start of tape, if available                          *
    **************************************************************************/
@@ -530 +528 @@
     assert(raidlist != NULL);
 
-    while (get_cfg_file_from_archive()) {
-        if (!ask_me_yes_or_no
-            ("Failed to find config file/archives. Choose another source?"))
-        {
-            fatal_error("Unable to find config file/archives. Aborting.");
-        }
-        interactively_obtain_media_parameters_from_user(FALSE);
-    }
-
-    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
+    read_cfg_file_into_bkpinfo(MINDI_CACHE"/mondorestore.cfg");
 
     /* edit_mountlist if wanted */
     log_it("About to edit mountlist");
     if (g_text_mode) {
-        save_mountlist_to_disk(mountlist, g_mountlist_fname);
-        mr_asprintf(tmp, "%s %s", find_my_editor(), g_mountlist_fname);
+        save_mountlist_to_disk(mountlist, MINDI_CACHE"/mountlist.txt");
+        mr_asprintf(tmp, "%s %s", find_my_editor(), MINDI_CACHE"/mountlist.txt");
         res = system(tmp);
         mr_free(tmp);
 
-        load_mountlist(mountlist, g_mountlist_fname);
-    } else {
-        res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
+        load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt");
+    } else {
+        res = edit_mountlist(MINDI_CACHE"/mountlist.txt", mountlist, raidlist);
     }
     log_it("Finished editing mountlist");
@@ -557 +546 @@
         paranoid_MR_finish(1);
     }
-    save_mountlist_to_disk(mountlist, g_mountlist_fname);
+    save_mountlist_to_disk(mountlist, MINDI_CACHE"/mountlist.txt");
     save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);