[X2Go-Commits] [live-build-x2go] 71/167: expanded logging, changed log messages
git-admin at x2go.org
git-admin at x2go.org
Sat Nov 18 00:32:44 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/openbox-magic-pixel-workaround
in repository live-build-x2go.
commit 1e46e4032cee466df7e61dd5b82ff4ce7b88de3f
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date: Mon Jul 24 18:19:05 2017 +0200
expanded logging, changed log messages
---
config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver b/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver
index 4f2abfd..7365b9b 100755
--- a/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver
+++ b/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver
@@ -38,18 +38,19 @@ fi
touch /root/.ssh/authorized_keys
chmod 600 /root/.ssh/authorized_keys
+ echo -en "\n\$(date +'%F | %T | ')'\$0': Attempting SSH public keyfile download ..." | tee -a /dev/tty8
if echo "$PUBKEYURL" | grep -q "^tftp://" ; then
PUBKEYSERVER=$(echo "$PUBKEYURL" | sed 's#^tftp://\([^/]*\)/.*$#\1#' )
PUBKEYPATH=$(echo "$PUBKEYURL" | sed 's#^tftp://[^/]*/\(.*\)$#\1#' )
if [ -n "\$PUBKEYSERVER" ] && [ -n "\$PUBKEYPATH" ] ; then
while ! atftp $PUBKEYSERVER -g -r $PUBKEYPATH -l /root/.ssh/authorized_keys ; do
- echo -en "\n\$(date +'%F | %T | ')'\$0': Waiting for SSH Public Key ..." | tee -a /dev/tty8
+ echo -en "\n\$(date +'%F | %T | ')'\$0': still waiting for download (tftp) ..." | tee -a /dev/tty8
sleep 5
done
fi
else
while ! wget -q -O - $PUBKEYURL >/root/.ssh/authorized_keys ; do
- echo -en "\n\$(date +'%F | %T | ')'\$0': Waiting for SSH Public Key ..." | tee -a /dev/tty8
+ echo -en "\n\$(date +'%F | %T | ')'\$0': still waiting for download (wget) ..." | tee -a /dev/tty8
sleep 5
done
fi
--
Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
More information about the x2go-commits
mailing list