Changeset 2424 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-archive.c

Timestamp:

Sep 25, 2009, 6:44:01 PM (15 years ago)

Author:

Bruno Cornec

Message:

• analyze-my-lvm now removes excluded devices from list coming from mondoarchive
• new mr_make_devlist_from_pathlist which handle the new bkpinfo->exclude_devs field containing the excluded devices and remove corresponding code from libmondo-cli.c
• Move DSF code into libmondo-devices.c for coherency, and only the previous function is made externally available
• Remove dev_to_exclude in libmondo-archive.c which wasn't working correctly and replace it with bkpinfo->exclude_devs

File:

• branches/2.2.9/mondo/src/common/libmondo-archive.c (modified) (4 diffs)

branches/2.2.9/mondo/src/common/libmondo-archive.c

@@ -522 +522 @@
     char *cd_recovery_sz = NULL;
     char *tape_size_sz = NULL;
-    char *devs_to_exclude = NULL;
     char *use_lilo_sz = NULL;   /* BCO: shared between LILO/ELILO */
     char *value = NULL;
@@ -541 +540 @@
 
     assert(bkpinfo != NULL);
-    mr_asprintf(&tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
-            bkpinfo->exclude_paths);
-    mr_asprintf(&devs_to_exclude, "%s", call_program_and_get_last_line_of_output(tmp));
-    mr_free(tmp);
-
-    mr_asprintf(&tmp, "devs_to_exclude = '%s'", devs_to_exclude);
-    log_msg(2, tmp);
-    mr_free(tmp);
 
     mvaddstr_and_log_it(g_currentY, 0,
@@ -884 +875 @@
             last_filelist_number,   // parameter #12 (STRING)
             estimated_total_noof_slices,    // parameter #13 (INT)
-            devs_to_exclude,    // parameter #14
+            bkpinfo->exclude_devs,  // parameter #14
             use_comp_sz,        // parameter #15
             use_lilo_sz,        // parameter #16
@@ -892 +883 @@
             use_gzip_sz);       // parameter #20 (STRING)
 
-    mr_free(devs_to_exclude);
     mr_free(last_filelist_number);
     mr_free(tape_device);