various fixes, mostly for etiona

[distro-setup] / conflink

diff --git a/conflink b/conflink
index 61291f2b42b643dfc2f68008032e892de501da64..8deae093a7bbee829a72ab1cc590ed8a91390372 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 source /a/bin/errhandle/err
-errcatch-cleanup() {
+err-cleanup() {
   echo 1 >~/.local/conflink
 }
 
@@ -98,7 +98,7 @@ common-file-setup() {
         # A = preserve acls
         # X = preserve extended attributes
         # i = itemize
-      done < <(s rsync -n -aiSAX --chown=root:root --chmod=g-s \
+      done < <(s rsync -aiSAX --chown=root:root --chmod=g-s \
                  --exclude=/etc/dovecot/users \
                  --exclude='/etc/exim4/passwd*' \
                  --exclude='/etc/exim4/*.pem' \