Changeset 948 in MondoRescue for branches/stable/mondo/src/mondoarchive

Timestamp:

Nov 19, 2006, 1:27:46 AM (18 years ago)

Author:

Bruno Cornec

Message:

• mondoarchive does not backup acl+xattr by default anymore
• Add -z option to mondoarchive to support acl+xattr backup
• small mindi fix
• this may break mondo compatibility so tests are required before distributing that version.
• this is still incomplete as that aprameter should be passed for mondorestore to know what to do.

Location:

branches/stable/mondo/src/mondoarchive

Files:

• main.c (modified) (2 diffs)
• mondo-cli.c (modified) (3 diffs)

branches/stable/mondo/src/mondoarchive/main.c

@@ -142 +142 @@
 char *ps_options = "auxww";
 char *ps_proc_id = "$2";
-char *g_getfacl = NULL;
-char *g_getfattr = NULL;
 
 extern t_bkptype g_backup_media_type;
@@ -458 +456 @@
             bkpinfo->scratchdir);
 
-    if (find_home_of_exe("getfacl")) {
-        asprintf(&g_getfacl,"getfacl");
-    }
-    if (find_home_of_exe("getfattr")) {
-        asprintf(&g_getfattr,"getfattr");
-    }
-
     /* If we're meant to backup then backup */
     if (bkpinfo->backup_data) {

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

@@ -202 +202 @@
 
 extern double g_kernel_version;
-
 extern int g_current_media_number;
-
-
-
 extern pid_t g_main_pid;
-
-
-
-
 extern char *resolve_softlinks_to_get_to_actual_device_file(char *);
 
-
+/* Do we use extended attributes and acl ? 
+ * By default no, use --acl & --attr options to force their usage */
+char *g_getfacl = NULL;
+char *g_getfattr = NULL;
 
 /**
@@ -673 +668 @@
         bkpinfo->backup_media_type = cdrw;
     }
+    if (flag_set['z']) {
+        if (find_home_of_exe("getfattr")) {
+            asprintf(&g_getfattr,"getfattr");
+        }
+        if (find_home_of_exe("getfacl")) {
+            asprintf(&g_getfacl,"getfacl");
+        }
+    }
+    }
 
     /* optional, popular */
@@ -1021 +1025 @@
     while ((opt =
             getopt(argc, argv,
-                   "0123456789A:B:C:DE:FHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:"))
+                   "0123456789A:B:C:DE:FHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"))
            != -1) {
         if (opt == '?') {