[X2Go-Commits] [live-build-x2go] 17/160: un-did backgrounding

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 01:55:34 CET 2017


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

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

commit eaf2a2ffcd39a5764923283a7e733c06d590ab9a
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Fri Jul 21 21:55:08 2017 +0200

    un-did backgrounding
---
 .../lib/live/config/2000-showifconfig              | 32 +++++++--------
 .../lib/live/config/2150-getsshpubkeysfromserver   | 48 +++++++++++-----------
 .../lib/live/config/2200-xserver-xorg-getxorgconf  | 40 +++++++++---------
 .../lib/live/config/2600-x2go-getsessions          | 40 +++++++++---------
 4 files changed, 76 insertions(+), 84 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2000-showifconfig b/config/includes.chroot/lib/live/config/2000-showifconfig
index 5ae4a1e..f227384 100755
--- a/config/includes.chroot/lib/live/config/2000-showifconfig
+++ b/config/includes.chroot/lib/live/config/2000-showifconfig
@@ -16,23 +16,21 @@ cat >/etc/network/if-up.d/000-showips <<SHOWIPS
 #!/bin/bash
 export TERM=linux;
 
-(
-	while [ -z "\$(hostname -I)" ] ; do
-		echo "'\$0' is waiting for a client IP." | tee -a /dev/tty9
-	        sleep 2
-	done
-	
-	IPMSG=\$(LANG=C \
-	/sbin/ip a | \
-	/bin/grep -P --color=always "inet.*? [\. 0-9a-f:/]*? |$" | \
-	GREP_COLOR="1;32" \
-	/bin/grep -P --color=always "link/ether .*? |$" ); \
-	IPMSG=\$( sed 's/^/- /' <<< "\$IPMSG" ); 
-	sed -i '/^- /d' /etc/issue; 
-	sed -i '/^- /d' /etc/issue.net; 
-	echo "\$IPMSG" >> /etc/issue; 
-	echo "\$IPMSG" >> /etc/issue.net
-) &
+while [ -z "\$(hostname -I)" ] ; do
+	echo "'\$0' is waiting for a client IP." | tee -a /dev/tty9
+	sleep 2
+done
+
+IPMSG=\$(LANG=C \
+/sbin/ip a | \
+/bin/grep -P --color=always "inet.*? [\. 0-9a-f:/]*? |$" | \
+GREP_COLOR="1;32" \
+/bin/grep -P --color=always "link/ether .*? |$" ); \
+IPMSG=\$( sed 's/^/- /' <<< "\$IPMSG" ); 
+sed -i '/^- /d' /etc/issue; 
+sed -i '/^- /d' /etc/issue.net; 
+echo "\$IPMSG" >> /etc/issue; 
+echo "\$IPMSG" >> /etc/issue.net
 SHOWIPS
 
 chmod 755 /etc/network/if-up.d/000-showips
diff --git a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver
index 217ce24..16616f6 100755
--- a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver
+++ b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver
@@ -17,35 +17,33 @@ GetSSHPubKeysFromServer ()
 #!/bin/bash
 export TERM=linux;
 
-(
-	while [ -z "\$(hostname -I)" ] ; do
-		echo "'\$0' is waiting for a client IP." | tee -a /dev/tty9
-		sleep 2
-	done
-
-	# Set Keyfile
-	#
-	mkdir -p /root/.ssh
-	chmod 600 /root/.ssh
-	touch /root/.ssh/authorized_keys
-	chmod 600 /root/.ssh/authorized_keys
-
-	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 "Waiting for SSH Public Key ..."
-				sleep 5
-			done
-		fi
-	else
-		while ! wget -q -O - $PUBKEYURL >/root/.ssh/authorized_keys ; do
+while [ -z "\$(hostname -I)" ] ; do
+	echo "'\$0' is waiting for a client IP." | tee -a /dev/tty9
+	sleep 2
+done
+
+# Set Keyfile
+#
+mkdir -p /root/.ssh
+chmod 600 /root/.ssh
+touch /root/.ssh/authorized_keys
+chmod 600 /root/.ssh/authorized_keys
+
+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 "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
 GETPUBKEY
 
 		chmod 755 /etc/network/if-up.d/010-getsshpubkeysfromserver
diff --git a/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf b/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf
index e474167..bfd8d69 100755
--- a/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf
+++ b/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf
@@ -15,31 +15,29 @@ echo -n " xserver-xorg-getxorgconf"
 #!/bin/bash
 export TERM=linux;
 
-(
-	while [ -z "\$(hostname -I)" ] ; do
-		echo "'\$0' is waiting for a client IP."
-		sleep 2
-	done
-	if echo "$XORGCONFURL" | grep -q "^tftp://" ; then
-		XORGCONFSERVER=$(echo "$XORGCONFURL" | sed 's#^tftp://\([^/]*\)/.*$#\1#' )
-		XORGCONFPATH=$(echo "$XORGCONFURL" | sed 's#^tftp://[^/]*/\(.*\)$#\1#' )
-		if [ -n "$XORGCONFSERVER" ] && [ -n "$XORGCONFPATH" ] ; then
-			while ! atftp $XORGCONFSERVER -g -r $XORGCONFPATH -l $XORGCONFDESTINATION ; do
-				echo "Waiting for xorg.conf download ..."
-				sleep 5
-			done
-		fi
-	else
-		while ! wget -q -O $XORGCONFDESTINATION $XORGCONFURL ; do
+while [ -z "\$(hostname -I)" ] ; do
+	echo "'\$0' is waiting for a client IP."
+	sleep 2
+done
+if echo "$XORGCONFURL" | grep -q "^tftp://" ; then
+	XORGCONFSERVER=$(echo "$XORGCONFURL" | sed 's#^tftp://\([^/]*\)/.*$#\1#' )
+	XORGCONFPATH=$(echo "$XORGCONFURL" | sed 's#^tftp://[^/]*/\(.*\)$#\1#' )
+	if [ -n "$XORGCONFSERVER" ] && [ -n "$XORGCONFPATH" ] ; then
+		while ! atftp $XORGCONFSERVER -g -r $XORGCONFPATH -l $XORGCONFDESTINATION ; do
 			echo "Waiting for xorg.conf download ..."
-			sleep 5 
+			sleep 5
 		done
 	fi
+else
+	while ! wget -q -O $XORGCONFDESTINATION $XORGCONFURL ; do
+		echo "Waiting for xorg.conf download ..."
+		sleep 5 
+	done
+fi
 
-	if [ -s $XORGCONFDESTINATION ] ; then
-		mv $XORGCONFDESTINATION /etc/X11/xorg.conf
-	fi
-) &
+if [ -s $XORGCONFDESTINATION ] ; then
+	mv $XORGCONFDESTINATION /etc/X11/xorg.conf
+fi
 GETXORG
                 chmod 755 /etc/network/if-up.d/020-getxorgconf
         fi
diff --git a/config/includes.chroot/lib/live/config/2600-x2go-getsessions b/config/includes.chroot/lib/live/config/2600-x2go-getsessions
index aa00f3a..2ff8d2b 100755
--- a/config/includes.chroot/lib/live/config/2600-x2go-getsessions
+++ b/config/includes.chroot/lib/live/config/2600-x2go-getsessions
@@ -18,31 +18,29 @@ X2GoGetSessions ()
 #!/bin/bash
 export TERM=linux;
 
-(
-	while [ -z "\$(hostname -I)" ] ; do
-		echo "'\$0' is waiting for a client IP."
-		sleep 2
-	done
-	if echo "$SESSIONSURL" | grep -q "^tftp://" ; then
-		SESSIONSSERVER=$(echo "$SESSIONSURL" | sed 's#^tftp://\([^/]*\)/.*$#\1#' )
-		SESSIONSPATH=$(echo "$SESSIONSURL" | sed 's#^tftp://[^/]*/\(.*\)$#\1#' )
-		if [ -n "$SESSIONSSERVER" ] && [ -n "$SESSIONSPATH" ] ; then
-			while ! atftp $SESSIONSSERVER -g -r $SESSIONSPATH -l $SESSIONSDESTINATION ; do
-				echo "Waiting for session config data ..."
-				sleep 5
-			done
-		fi
-	else
-		while ! wget -q -O $SESSIONSDESTINATION $SESSIONSURL ; do
+while [ -z "\$(hostname -I)" ] ; do
+	echo "'\$0' is waiting for a client IP."
+	sleep 2
+done
+if echo "$SESSIONSURL" | grep -q "^tftp://" ; then
+	SESSIONSSERVER=$(echo "$SESSIONSURL" | sed 's#^tftp://\([^/]*\)/.*$#\1#' )
+	SESSIONSPATH=$(echo "$SESSIONSURL" | sed 's#^tftp://[^/]*/\(.*\)$#\1#' )
+	if [ -n "$SESSIONSSERVER" ] && [ -n "$SESSIONSPATH" ] ; then
+		while ! atftp $SESSIONSSERVER -g -r $SESSIONSPATH -l $SESSIONSDESTINATION ; do
 			echo "Waiting for session config data ..."
-			sleep 5 
+			sleep 5
 		done
 	fi
+else
+	while ! wget -q -O $SESSIONSDESTINATION $SESSIONSURL ; do
+		echo "Waiting for session config data ..."
+		sleep 5 
+	done
+fi
 
-	if [ -s $SESSIONSDESTINATION ] ; then
-		mv $SESSIONSDESTINATION /etc/x2go/x2gothinclient_sessions
-	fi
-) &
+if [ -s $SESSIONSDESTINATION ] ; then
+	mv $SESSIONSDESTINATION /etc/x2go/x2gothinclient_sessions
+fi
 GETSESS
 		chmod 755 /etc/network/if-up.d/030-getsessions
 	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