Changeset 2428 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

Timestamp:

Sep 28, 2009, 2:29:12 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Attempt to stay backward compatible without protocol for -n option
• Improving ssh support at restore time by providing a shadow file
• 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
• Fix an issue in is_this_device_mounted (string freed before last usage)
• Adds support for bnx2x (BL 460 G6) and auth_rpcgss (Debian 2.6.31)

(Backport from 2.2.9)

File:

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

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

@@ -517 +517 @@
     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;
@@ -536 +535 @@
 
     assert(bkpinfo != NULL);
-    if (bkpinfo->exclude_paths) {
-        mr_asprintf(tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'", bkpinfo->exclude_paths);
-        devs_to_exclude = call_program_and_get_last_line_of_output(tmp);
-        mr_free(tmp);
-
-        log_msg(2, "devs_to_exclude = '%s'", devs_to_exclude);
-    }
 
     mr_asprintf(tmp, "%s/filelist.full", bkpinfo->tmpdir);
@@ -815 +807 @@
             last_filelist_number,   // parameter #12 (STRING)
             estimated_total_noof_slices,    // parameter #13 (INT)
-            (devs_to_exclude == NULL) ? "\"\"" : devs_to_exclude,   // parameter #14
+            (bkpinfo->exclude_devs == NULL) ? "\"\"" : bkpinfo->exclude_devs,   // parameter #14
             use_comp_sz,        // parameter #15
             use_lilo_sz,        // parameter #16
@@ -826 +818 @@
 
     mr_free(tmp2);
-    mr_free(devs_to_exclude);
     mr_free(last_filelist_number);
     mr_free(tape_device);