[X2Go-Commits] [live-build-x2go] 34/38: unretab 2150-getsshpubkeysfromserver

git-admin at x2go.org git-admin at x2go.org
Fri Apr 28 11:56:51 CEST 2017


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

x2go pushed a commit to branch feature/fvwm
in repository live-build-x2go.

commit 3c952a6eeceb0100b09698dea70c665e0da9a62f
Author: Juri Grabowski <gratuxri at gmail.com>
Date:   Fri Apr 28 11:48:14 2017 +0200

    unretab 2150-getsshpubkeysfromserver
---
 .../lib/live/config/2150-getsshpubkeysfromserver   | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver
index e613d35..5d6ca0e 100755
--- a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver
+++ b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver
@@ -3,17 +3,17 @@
 GetSSHPubKeysFromServer ()
 {
 
-	# Output startup message
-	#
-	echo -n " getsshpubkeysfromserver"
+    # Output startup message
+    #
+    echo -n " getsshpubkeysfromserver"
 
 
-	PUBKEYURL=$(cat /proc/cmdline | \
-		    tr ' ' '\n' | \
-		    awk -F'=' ' /^pubkey=/ { print $2 }')
+    PUBKEYURL=$(cat /proc/cmdline | \
+            tr ' ' '\n' | \
+            awk -F'=' ' /^pubkey=/ { print $2 }')
 
-	if [ -n "$PUBKEYURL" ] ; then
-		cat >/etc/network/if-up.d/getsshpubkeysfromserver <<GETPUBKEY
+    if [ -n "$PUBKEYURL" ] ; then
+        cat >/etc/network/if-up.d/getsshpubkeysfromserver <<GETPUBKEY
 #!/bin/bash
 export TERM=linux;
 
@@ -29,24 +29,24 @@ 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
+    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
+    while ! wget -q -O - $PUBKEYURL >/root/.ssh/authorized_keys ; do
+        echo "Waiting for SSH Public Key ..."
+        sleep 5
+    done
 fi
 GETPUBKEY
 
-		chmod 755 /etc/network/if-up.d/getsshpubkeysfromserver
-	fi
+        chmod 755 /etc/network/if-up.d/getsshpubkeysfromserver
+    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