various fixes and additions on desktop

[distro-setup] / rootsshsync

diff --git a/rootsshsync b/rootsshsync
index ebfc80216b6e293e9162e5c2f3ec825048f166ad..9d9140af8ac75e39d4c1f599ddb2e8ca2c139fa6 100755 (executable)
--- a/rootsshsync
+++ b/rootsshsync
@@ -19,13 +19,14 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 [[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"
 
 if test -e /q/root/.ssh; then
-    export LNF_VERBOSE=true
-    if ! /a/exe/lnf /q/root/.ssh /root > /tmp/lnf_log; then
-        cat /tmp/lnf_log
-    fi
+    dest=/q/root/.ssh
+    /a/exe/lnf $dest /root
 else
+    dest=/root/.ssh
     mkdir -p /root/.ssh
     chmod 700 /root/.ssh
 fi
-cp -rL $(eval echo ~${SUDO_USER:-$USER})/.ssh/* /root/.ssh
+# -t times, so it won't rewrite the file every time,
+# -L resolve links
+rsync -rtL $(eval echo ~${SUDO_USER:-$USER})/.ssh/ $dest
 chown -R root:root /root/.ssh