[X2Go-Commits] [live-build-x2go] 04/04: fixed pubkey downloader

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch mini
in repository live-build-x2go.

commit 7200e9b100fc5a6b9e1d73fa290250431dc4d562
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Tue Aug 9 12:11:40 2016 +0200

    fixed pubkey downloader
---
 .../includes.chroot/lib/live/config/2150-setsshkey | 47 +++++++++++-----------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2150-setsshkey b/config/includes.chroot/lib/live/config/2150-setsshkey
index 01dbaa2..45572f7 100755
--- a/config/includes.chroot/lib/live/config/2150-setsshkey
+++ b/config/includes.chroot/lib/live/config/2150-setsshkey
@@ -8,33 +8,34 @@ SetSSHKey ()
 echo -n " setsshkey"
 
 
-PUBKEYURL=\$(cat /proc/cmdline | \
+PUBKEYURL=$(cat /proc/cmdline | \
 	    tr ' ' '\n' | \
-	    awk -F'=' ' /^pubkey=/ { print \$2 }')
+	    awk -F'=' ' /^pubkey=/ { print $2 }')
 
 if [ -n "$PUBKEYURL" ] ; then
 
-# Set Keyfile
-#
-mkdir -p /root/.ssh
-chmod 600 /root/.ssh
-touch /root/.ssh/authorized_keys
-chmod 600 /root/.ssh/authorized_keys
-
-if echo "$PUBKEY" | 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 "Waiting for SSH Public Key ..."
-                        sleep 5
-                done
-        fi
-else
-        while ! wget -q -O - $PUBKEYURL >/root/.ssh/authorized_keys ; do
-                echo "Waiting for SSH Public Key ..."
-                sleep 5
-        done
+	# Set Keyfile
+	#
+	mkdir -p /root/.ssh
+	chmod 600 /root/.ssh
+	touch /root/.ssh/authorized_keys
+	chmod 600 /root/.ssh/authorized_keys
+
+	if echo "$PUBKEY" | 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 "Waiting for SSH Public Key ..."
+				sleep 5
+			done
+		fi
+	else
+		while ! wget -q -O - $PUBKEYURL >/root/.ssh/authorized_keys ; do
+			echo "Waiting for SSH Public Key ..."
+			sleep 5
+		done
+	fi
 fi
 
 }

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git