Changeset 2572 in MondoRescue for branches/2.2.9

Timestamp:

Feb 4, 2010, 2:16:02 PM (14 years ago)

Author:

Bruno Cornec

Message:

setfacl doesn't need the -h option to restore physical paths

File:

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

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

@@ -536 +536 @@
     int i;
     char *p, *q;
+    char *tmp = NULL;
     FILE *pin, *pout, *faclin;
 
@@ -543 +544 @@
         || !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);