various fixes, internal mail server

[distro-setup] / rootsshsync

diff --git a/rootsshsync b/rootsshsync
index baf42967acf4e465b0752a46f454d2422550afbc..ebfc80216b6e293e9162e5c2f3ec825048f166ad 100755 (executable)
--- a/rootsshsync
+++ b/rootsshsync
@@ -16,11 +16,16 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
-if sudo test -e /q/root/.ssh; then
-    sudo /a/exe/lnf /q/root/.ssh /root
+[[ $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
 else
-    sudo mkdir -p /root/.ssh
-    sudo chmod 700 /root/.ssh
+    mkdir -p /root/.ssh
+    chmod 700 /root/.ssh
 fi
-sudo cp -rL $(eval echo ~${SUDO_USER:-$USER})/.ssh/* /root/.ssh
-sudo chown -R root:root /root/.ssh
+cp -rL $(eval echo ~${SUDO_USER:-$USER})/.ssh/* /root/.ssh
+chown -R root:root /root/.ssh