Changeset 1670 in MondoRescue

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)

Location:

branches/stable

Files:

• mindi/rootfs/proc/.keep (deleted)
• mondo/src/common/libmondo-filelist.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (2 diffs)
• mondo/src/common/newt-specific.c (modified) (1 diff)
• mondo/src/include/my-stuff.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-compare.c (modified) (3 diffs)

branches/stable/mondo/src/common/libmondo-filelist.c

@@ -1319 +1319 @@
     time_t this_time;
 
-    malloc_string(sth_B);
+    sth_B = malloc(8*MAX_STR_LEN);
     malloc_string(ith_B);
     malloc_string(new_with_spaces);

branches/stable/mondo/src/common/libmondo-tools.c

@@ -488 +488 @@
             if (bkpinfo->call_before_iso[0] == '\0') {
                 sprintf(bkpinfo->call_before_iso,
-                        "%s %s -o %s/temporary.iso . 2>> %s",
+                        "%s %s -o %s/"MONDO_TMPISOS" . 2>> %s",
                         mr_conf->iso_creation_cmd,mondo_mkisofs_sz, bkpinfo->tmpdir, MONDO_LOGFILE);
             } else {
                 mr_asprintf(&call_before_iso_user, bkpinfo->call_before_iso);
                 sprintf (bkpinfo->call_before_iso,
-                                    "(%s %s -o %s/temporary.iso . 2>> %s ; %s )",
+                                    "(%s %s -o %s/"MONDO_TMPISOS" . 2>> %s ; %s )",
                         mr_conf->iso_creation_cmd,mondo_mkisofs_sz, bkpinfo->tmpdir, MONDO_LOGFILE, call_before_iso_user);
                 mr_free(call_before_iso_user);
@@ -499 +499 @@
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
             sprintf(bkpinfo->call_make_iso,
-                    "%s %s %s dev=%s speed=%d %s/temporary.iso",
+                    "%s %s %s dev=%s speed=%d %s/"MONDO_TMPISOS,
                     mr_conf->iso_burning_cmd,
                     extra_cdrom_params, 

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

@@ -35 +35 @@
 
 extern char *MONDO_LOGFILE;
+
+extern struct s_bkpinfo *bkpinfo;
 
 /*@unused@*/

branches/stable/mondo/src/include/my-stuff.h

@@ -151 +151 @@
  */
 #define IS_THIS_A_STREAMING_BACKUP(x) (x == tape || x == udev || x == cdstream)
+
+/**
+ * The stub name of the temporary ISO image to create, burn, and remove.
+ */
+#define MONDO_TMPISOS "temporary.iso"
 
 /**

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"));