[X2Go-Commits] [live-build-x2go] 11/160: make getsessions delete thinclient_sessions file if boot parameter was passed; make thinclientconfig wait for valid thinclient_sessions file unless broker mode is active

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 01:55:33 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 820a66b935d438b96a1b4e5d931f6632dfd4b3d1
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Fri Jul 21 15:00:54 2017 +0200

    make getsessions delete thinclient_sessions file if boot parameter was passed; make thinclientconfig wait for valid thinclient_sessions file unless broker mode is active
---
 config/includes.chroot/lib/live/config/2600-x2go-getsessions      | 3 +++
 config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/config/includes.chroot/lib/live/config/2600-x2go-getsessions b/config/includes.chroot/lib/live/config/2600-x2go-getsessions
index a3c476c..a022684 100755
--- a/config/includes.chroot/lib/live/config/2600-x2go-getsessions
+++ b/config/includes.chroot/lib/live/config/2600-x2go-getsessions
@@ -10,6 +10,9 @@ X2GoGetSessions ()
 		       tr ' ' '\n' | \
 		       awk -F'=' ' /^sessionsurl=/ { print $2 }')
 	if [ -n "$SESSIONSURL" ] && [ -d /etc/x2go ] ; then 
+		# only mv this file if SESSIONSURL was set. If not, leave it in place - as
+                # it might have been customized at image creation time
+        	mv /etc/x2go/x2gothinclient_sessions /etc/x2go/x2gothinclient_sessions_old
 		SESSIONSDESTINATION=/etc/x2go/x2gothinclient_sessions_new
 		cat >/etc/network/if-up.d/getsessions <<GETSESS
 #!/bin/bash
diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
index 39d884f..96ab5a2 100755
--- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
@@ -107,6 +107,13 @@ if [ -n "\$BROKERURL" ]; then
 	SESSIONFROM="--broker-url=\$BROKERURL"
 else 
 	SESSIONFROM="--session-conf=/etc/x2go/x2gothinclient_sessions"
+	while ! [ -s /etc/x2go/x2gothinclient_sessions ]; do
+		OLDCON=$(fgconsole)
+		chvt 1
+	        echo "'$0' is waiting for a valid '/etc/x2go/x2gothinclient_sessions' file."
+		sleep 2
+	done
+	[ -n "$OLDCON" ] && chvt $OLDCON
 fi
 if [ -n "\$LDAP" ] ; then
 	if [ -n "\$LDAP1" ] ; then

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