mostly a bunch of fixes

[distro-setup] / conflink

diff --git a/conflink b/conflink
index e20da6e94f743b607aac6a17553591ca569e6f00..18a6ed84f0dc177c85e72ccf0aaa5adc075e93ca 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -114,7 +114,8 @@ common-file-setup() {
       # we dont want t, instead c for checksum.
       # That way we dont set times on directories.
       # -a = -rlptgoD
-      cmd=( s rsync -rclpgoDiSAX --chmod=Dg-s --chown=root:root
+      # -A is acls, implies -p
+      cmd=( s rsync -rclgoDiSAX --chmod=Dg-s --chown=root:root
             --exclude=/etc/dovecot/users
             --exclude='/etc/exim4/passwd*'
             --exclude='/etc/exim4/*.pem'