X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=855014377e8c74edc177e8906eede0787946d1d8;hb=2f3bcb7c2dcd3899be80e83673a4625e0651dda1;hp=e20da6e94f743b607aac6a17553591ca569e6f00;hpb=dc34d23c63cd83a7cc7a79525445aad3293c7241;p=distro-setup

diff --git a/conflink b/conflink
index e20da6e..8550143 100755
--- 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'
@@ -241,8 +242,6 @@ case $user in
 
     if [[ -d /var/lib/bitcoind && -d /p/c/user-specific/bitcoin ]]; then
       s rsync -clpgoDiSAX --chmod=Dg-s --chown=bitcoin:bitcoin /p/c/user-specific/bitcoin/settings.json /var/lib/bitcoind
-      # i'm not sure of the perfect permissions here, but
-      # 640 seems good.
       s rsync -rclpgoDiSAX --chmod=Dg-s --chown=root:bitcoin /p/c/user-specific/bitcoin/bitcoin /etc
     fi
     ##### end special extra stuff #####