[X2Go-Commits] [live-build-x2go] 159/160: config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig: fix VT switching on slow resource downloads.

[git-admin at x2go.org]

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 f345a56052f231b3794400fe94a6c12c86359a8d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Nov 18 01:50:56 2017 +0100

    config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig: fix VT switching on slow resource downloads.
---
 .../includes.chroot/lib/live/config/2900-x2go-thinclientconfig   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
index 841ff9a..0e124d2 100755
--- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
@@ -111,9 +111,10 @@ LDAP2=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cm
 
 # Check for background and branding SVGs
 BRANDING=''
+OLDCON=''
 if grep -q ' branding=' /proc/cmdline; then
 	while ! [ -s /etc/x2go/branding.svg ]; do
-		OLDCON=\$(fgconsole)
+		[ -z "\$OLDCON" ] && OLDCON="\$(fgconsole)"
 		chvt 1
 	        echo "'\$0' is waiting for a valid '/etc/x2go/branding.svg' file."
 		sleep 2
@@ -122,9 +123,10 @@ if grep -q ' branding=' /proc/cmdline; then
 	BRANDING='--branding=/etc/x2go/branding.svg'
 fi
 BACKGROUND=''
+OLDCON=''
 if grep -q ' bg=' /proc/cmdline; then
 	while ! [ -s /etc/x2go/bg.svg ]; do
-		OLDCON=\$(fgconsole)
+		[ -z "\$OLDCON" ] && OLDCON="\$(fgconsole)"
 		chvt 1
 	        echo "'\$0' is waiting for a valid '/etc/x2go/bg.svg' file."
 		sleep 2
@@ -141,8 +143,9 @@ if [ -n "\$BROKERURL" ]; then
 	SESSIONFROM="--broker-url=\$BROKERURL"
 else 
 	SESSIONFROM="--session-conf=/etc/x2go/x2gothinclient_sessions"
+	OLDCON=''
 	while ! [ -s /etc/x2go/x2gothinclient_sessions ]; do
-		OLDCON=\$(fgconsole)
+		[ -z "\$OLDCON" ] && OLDCON="\$(fgconsole)"
 		chvt 1
 	        echo "'\$0' is waiting for a valid '/etc/x2go/x2gothinclient_sessions' file."
 		sleep 2

--
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