changes for buster linode

[distro-setup] / conflink

diff --git a/conflink b/conflink
index bb5d480d4ee04d7c235ba25fd7dff78dfa70374e..bbe13126750cddb64e67a636fefeacc2291021a7 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -64,7 +64,7 @@ common-file-setup() {
 }
 
 user=$(id -un)
-all_dirs=({/a/c,/p/c}{,/machine_specific/$HOSTNAME})
+all_dirs=({/a/bin/ds,/p/c}{,/machine_specific/$HOSTNAME})
 # note, we assume a group of hosts does not have the
 # same name as a single host, which is no problem on our scale.
 for x in /p/c/machine_specific/*.hosts /a/bin/ds/machine_specific/*.hosts; do
@@ -113,7 +113,9 @@ case $user in
 
     ##### end special extra stuff #####
 
-    sudo bash -c 'shopt -s nullglob; cd /etc/openvpn; for f in client/* server/*; do ln -sf $f .; done'
+    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]}"
     ;;