Changeset 2576 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-filelist.c

Timestamp:

Feb 5, 2010, 5:51:53 PM (14 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 2567:2574 /mondorescue/branches/2.2.9
(At parity with 2.2.9.2)

• Improve device exclusion for LVM by adding support for symlinks and mapper systematically at all levels (PV, VG, LV). Should really provvide the best support possible for LVM exclusion.
• Also use the same exclusion technique for MINDI_EXCLUDE_DEVS in mindi itself just in case.
• ums-cypress also added to module list following user feedback
• Fix a bug in the vgcreate command generation where too many PVs were mentioned, due to the extension of the list. We now use a $current_PVs variable which is limited to what i needed
• setfacl doesn't need the -h option to restore physical paths
• THis version of mondo uses another interface for the mr_asprintf function than the one used just previously which was coredumping
• Adds support for sata_svw for Proliant DL 385 G5p. Fixes #391.

File:

• branches/2.2.10/mondo/src/common/libmondo-filelist.c (modified) (2 diffs)

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

@@ -525 +525 @@
     int i;
     char *p, *q;
+    char *tmp = NULL;
     FILE *pin, *pout, *faclin;
 
@@ -531 +532 @@
         || !does_file_exist(orig_msklist)) {
         log_msg(1, "No masklist provided. I shall therefore set ALL attributes.");
-        mr_asprintf(command, "gzip -dc %s | %s -h --restore - 2>> %s", original_exat_fname, executable, MONDO_LOGFILE);
+        if (strstr(executable,"acl")) {
+            /*  setfacl needs no additional option for physical walk */
+            mr_asprintf(tmp,"");
+        } else {
+            /*  setfattr needs option -h for physical walk */
+            mr_asprintf(tmp,"-h");
+        }
+        mr_asprintf(command, "gzip -dc %s | %s %s --restore - 2>> %s", original_exat_fname, executable, tmp, MONDO_LOGFILE);
+        mr_free(tmp);
         log_msg(1, "command = %s", command);
         retval = system(command);