Changeset 1670 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Oct 1, 2007, 12:50:28 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Try to fix the issue with large exclude list (> 1000 chars) Some variables created after exclude_path (indirectly) were not sized big enough to handle them.
• Remove useless .keep file
• remove temporary.iso name remaining and suppress a warning in log trying to remove it in the tmpdir
• missing extern bkpinfo in newt-specific.c
• Attempt to fix #191 (allow edition of mountlist in compare mode)

(merge -r1662:1669 $SVN_M/branches/2.2.5)

File:

• branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (3 diffs)

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

@@ -21 +21 @@
 /* Reference to global bkpinfo */
 extern struct s_bkpinfo *bkpinfo;
+
+extern char *g_mountlist_fname;
 
 //static char cvsid[] = "$Id$";
@@ -506 +508 @@
 {
     int retval = 0;
+    int res = 0;
     long q = 0L;
     char *tmp = NULL;
@@ -533 +536 @@
 
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
+
+    /* edit_mountlist if wanted */
+    iamhere("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);
+        res = system(tmp);
+        mr_free(tmp);
+        load_mountlist(mountlist, g_mountlist_fname);
+    } else {
+        res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
+    }
+    iamhere("Finished editing mountlist");
+    if (res) {
+        paranoid_MR_finish(1);
+    }
+    save_mountlist_to_disk(mountlist, g_mountlist_fname);
+    save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
+
     g_current_media_number = 1;
     mvaddstr_and_log_it(1, 30, _("Comparing Automatically"));