Changeset 949 in MondoRescue for branches

Timestamp:

Nov 19, 2006, 2:11:58 AM (18 years ago)

Author:

Bruno Cornec

Message:

Should fix #63, , and add the required interface in mondorestore to handle the new way of dealing with ACLs and XATTRs

Location:

branches/stable

Files:

• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (2 diffs)
• mondo/src/mondoarchive/mondo-cli.c (modified) (2 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

branches/stable/mindi/mindi

@@ -1093 +1093 @@
     AddFileToCfgIfExists $MINDI_TMP/BACKUP-MEDIA-TYPE backup-media-type $outfile
     AddFileToCfgIfExists $MINDI_TMP/DIFFERENTIAL      differential      $outfile
+    AddFileToCfgIfExists $MINDI_TMP/ACL      acl      $outfile
+    AddFileToCfgIfExists $MINDI_TMP/XATTR      xattr      $outfile
 }
 

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

@@ -693 +693 @@
     /*@ buffer ************************************************************ */
     char *tmp;
+    char *tmp1 = NULL;
     char *scratchdir;
     char *command;
@@ -959 +960 @@
     } else {
         res += write_one_liner_data_file(tmp, "0");
+    }
+
+    if (g_getfattr) {
+        asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);
+        if (write_one_liner_data_file(tmp1, "TRUE")) {
+            log_msg(1, "%ld: Unable to write one-liner XATTR",
+                __LINE__);
+        }
+        paranoid_free(tmp1);
+    }
+    if (g_getfacl) {
+        asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);
+        if (write_one_liner_data_file(tmp1, "TRUE")) {
+            log_msg(1, "%ld: Unable to write one-liner ACL",
+                __LINE__);
+        }
+        paranoid_free(tmp1);
     }
 

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -356 +356 @@
     char *q;
 
-    long itbs;
+    long itbs = 0L;
 
     struct stat buf;
@@ -675 +675 @@
             asprintf(&g_getfacl,"getfacl");
         }
-    }
     }
 

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -161 +161 @@
 extern int g_partition_table_locked_up;
 
+/* Should we use or not extended attributes and acl when restoring */
+char *g_getfattr = NULL;
+char *g_getfacl = NULL;
+
 /**
  * @addtogroup restoreUtilityGroup
@@ -1099 +1103 @@
         bkpinfo->use_star = TRUE;
         log_msg(1, "Goody! ... bkpinfo->use_star is now true.");
+    }
+
+    read_cfg_var(cfg_file, "acl", value);
+    if (strstr(value, "TRUE")) {
+        asprintf(&g_getfacl,"setfacl");
+        log_msg(1, "We will restore ACLs");
+        if (! find_home_of_exe(setfacl)) {
+            log_msg(1, "Unable to restore ACLs as no setfacl found");
+        }
+    }
+    read_cfg_var(cfg_file, "xattr", value);
+    if (strstr(value, "TRUE")) {
+        asprintf(&g_getfattr,"setfattr");
+        log_msg(1, "We will restore XATTRs");
+        if (! find_home_of_exe(setfattr)) {
+            log_msg(1, "Unable to restore XATTRs as no setfattr found");
+        }
     }