updates, especially for etiona

[distro-setup] / conflink

diff --git a/conflink b/conflink
index 61291f2b42b643dfc2f68008032e892de501da64..69b6a6eca005592194ebe2f8c22691527e9a7005 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' \
@@ -173,10 +173,6 @@ case $user in
 
     ##### end special extra stuff #####
 
-    if [[ -e /etc/openvpn ]]; then
-      sudo bash -c 'shopt -s nullglob && cd /etc/openvpn && for f in client/* server/*; do ln -sf $f .; done'
-    fi
-
     m sudo -H -u user2 "${BASH_SOURCE[0]}"
 
     f=/a/bin/distro-setup/system-status