[X2Go-Commits] [live-build-x2go] 61/166: 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]

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

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

commit 6b2292c9b91504e61c5438ffc44dac4c11fb0fd0
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 +++
 1 file changed, 3 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

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