failed 9p experiment

[distro-setup] / conflink

diff --git a/conflink b/conflink
index 948d1a22694b89aa08b4b984b20b7f494713bb4c..7a597e3d86db0c970805531509a99b98c527fb0b 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -54,25 +54,8 @@ common-file-setup() {
             m s cp -RLT --preserve=mode,timestamps $fs /
         fi
 
-        # one program so far does not work with a symlink,
-        # so we have to use a bind mount
-        bdir=$dir/binds
-        if [[ -e $bdir && $USER == ian ]]; then
-            for f in $(find $bdir -type f); do
-                dst=/home/ian/${f##$bdir}
-                if [[ ! -e $dst || $(stat -c%i $f $dst |uniq -u) ]]; then
-                    if mountpoint -q $dst; then
-                        s umount $dst
-                    fi
-                    # note: in future, may need to mkdir also
-                    [[ -e $dst ]] || touch $dst
-                    s mount --bind $f $dst
-                fi
-            done
-        fi
-
         if [[ -e $dir/subdir_files ]]; then
-            subdir-link-r $dir/subdir_files
+            m subdir-link-r $dir/subdir_files
         fi
         local x=( $dir/!(binds|subdir_files|filesystem|machine_specific|..|.) )
         (( ${#x[@]} >= 1 )) || continue
@@ -91,11 +74,19 @@ c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
 case $USER in
     ian)
         # p needs to go first so .ssh link is created, then config link inside it
-        common-file-setup ${all_dirs[@]}
-        sudo -u traci "$BASH_SOURCE"
+        m common-file-setup ${all_dirs[@]}
+        if [[ -d /etc/bind/bind-writable ]]; then
+            # need bind writable dir for nsupdate, or else we get
+            # named[20823]: /etc/bind/db.iank.pw.jnl: create: permission denied
+            m s chgrp bind /etc/bind/bind-writable
+        fi
+        if [[ -e /etc/davpass ]] && getent group www-data &>/dev/null; then
+            s chgrp www-data /etc/davpass
+        fi
+        m sudo -H -u traci "$BASH_SOURCE"
         ;;
     traci)
-        common-file-setup ${c_dirs[@]}
+        m common-file-setup ${c_dirs[@]}
         ;;
     *)
         echo "$0: error: unexpected user"; exit 1