Changeset 2475 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.c

Timestamp:

Nov 10, 2009, 2:52:43 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Update deplist for Debian support
• Fix #363 where exclude_paths was extended up to memory limit dumping core
• Default to DVD size when in iso or netfs mode
• Improve analysis of kernel modules by printing whether it's a live or extra module which has not been found (Matthew Cline) as reported in #362
• Remove useless pb_log and MONDO_TRACEFILE
• /dev/shm is now part of the default exclude list
• some distro hold lvm commands under /usr/sbin
• bzip2 is under /bin on Debian

(merge from 2.2.9 branch)

File:

• branches/2.2.10/mondo/src/common/libmondo-devices.c (modified) (7 diffs)

branches/2.2.10/mondo/src/common/libmondo-devices.c

@@ -1906 +1906 @@
 char *mounted_on_dsf = NULL;
 char *not_mounted_on_dsf = NULL;
-char token_chars[] =" \t\r\f\a\0";
+char token_chars[] =" \t\r\f\a\0\n";
 
 while ((token = mr_strtok(pathlist, token_chars, &lastpos)) != NULL) {
@@ -1925 +1925 @@
                 log_to_screen("  %s\n", mounted_on_dsf);
                 log_msg (5, "Adding to bkpinfo->exclude_paths due to -E option: %s", mounted_on_dsf);
-                mr_strcat(bkpinfo->exclude_paths, "%s ", mounted_on_dsf);
+                mr_strcat(bkpinfo->exclude_paths, " %s ", mounted_on_dsf);
                 mr_strcat(bkpinfo->exclude_devs, " %s ", token);
             }
@@ -1936 +1936 @@
                 log_to_screen("Not archiving the following file systems:\n");
                 log_to_screen("  %s\n", not_mounted_on_dsf);
-                strcat(bkpinfo->exclude_paths, not_mounted_on_dsf);
-                strcat(bkpinfo->exclude_paths, "");
+                mr_strcat(bkpinfo->exclude_paths, " %s ", mounted_on_dsf);
             }
         }
@@ -1948 +1947 @@
     case -1:
         if (mode == 'E') {
-            mr_strcat(bkpinfo->exclude_paths, "%s ", token);
+            /*  Add the token if not already in the list */
+            if (strstr(bkpinfo->exclude_paths,token) == NULL) {
+                mr_strcat(bkpinfo->exclude_paths, " %s ", token);
+            }
         } else {
-            mr_strcat(bkpinfo->include_paths, "%s ", token);
+            /*  Add the token if not already in the list */
+            if (strstr(bkpinfo->include_paths,token) == NULL) {
+                mr_strcat(bkpinfo->include_paths, " %s ", token);
+            }
         }
         break;
@@ -2819 +2824 @@
             if (!bkpinfo->restore_data) {
                 mr_asprintf(comment, "How much data (in Megabytes) will each media store?");
-                // BERLIOS: 4480 shouldn't be hardcoded here
-                sz_size = popup_and_get_string("Size", comment, "4480");
+                mr_asprintf(tmp, "%d", DEFAULT_DVD_DISK_SIZE);
+                sz_size = popup_and_get_string("Size", comment, tmp);
                 mr_free(comment);
+                mr_free(tmp);
                 if (sz_size == NULL) {
                     log_to_screen("User has chosen not to backup the PC");
@@ -2932 +2938 @@
                     finish(1);
                 }
-                p = popup_and_get_string("ISO size.", "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s or DVD's you plan to backup to.", sz_size);
+                mr_asprintf(tmp, "%d", DEFAULT_DVD_DISK_SIZE);
+                p = popup_and_get_string("ISO size.", "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s (700) or DVD's (4480) you plan to backup to.", tmp);
+                mr_free(tmp);
                 if (p == NULL) {
                     log_to_screen("User has chosen not to backup the PC");
@@ -3116 +3124 @@
     }
     log_it("compression = %ld", bkpinfo->compression_level);
+    log_it("exclude_path = %s", bkpinfo->exclude_paths);
+    log_it("include_path = %s", bkpinfo->include_paths);
 
     /* Handle devices passed in bkpinfo and print result */
-    mr_make_devlist_from_pathlist(bkpinfo->exclude_paths, 'E');
-    mr_make_devlist_from_pathlist(bkpinfo->include_paths, 'I');
+    /*  the mr_make_devlist_from_pathlist function appends
+    *  to the *_paths variables so copy before */
+    mr_asprintf(tmp, "%s ", bkpinfo->exclude_paths);
+    mr_make_devlist_from_pathlist(tmp, 'E');
+    mr_free(tmp);
+    mr_asprintf(tmp, "%s ", bkpinfo->include_paths);
+    mr_make_devlist_from_pathlist(tmp, 'I');
+    mr_free(tmp);
 
     log_it("scratchdir = '%s'", bkpinfo->scratchdir);