move some stuff to frodo, rename user to iank, fixes

[distro-setup] / conflink

diff --git a/conflink b/conflink
index 7a597e3d86db0c970805531509a99b98c527fb0b..139096f507446c0b4fc4357b13e3b8087b651226 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -49,9 +49,9 @@ common-file-setup() {
     local dir fs x bdir f dst
     for dir in "$@"; do
         fs=$dir/filesystem
-        if [[ -e $fs && $USER == ian ]]; then
+        if [[ -e $fs && $USER =~ ^iank?$ ]]; then
             # note, symlinks get resolved, not copied.
-            m s cp -RLT --preserve=mode,timestamps $fs /
+            s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
         fi
 
         if [[ -e $dir/subdir_files ]]; then
@@ -72,7 +72,7 @@ done
 
 c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
 case $USER in
-    ian)
+    ian|iank)
         # p needs to go first so .ssh link is created, then config link inside it
         m common-file-setup ${all_dirs[@]}
         if [[ -d /etc/bind/bind-writable ]]; then