[X2Go-Commits] [live-build-x2go] 123/167: added support to preselect session via boot parameter

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 00:32:54 CET 2017


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

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

commit 8a4d855c5cd6ea3600d140ad41dee104bd14deb2
Author: Stefan Baur <kontakt at baur-itcs.de>
Date:   Tue Oct 24 01:52:11 2017 +0200

    added support to preselect session via boot parameter
---
 config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
index c8479e4..36add67 100755
--- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
@@ -92,6 +92,9 @@ xsetroot -solid "#246ed8"
 BROKERURL=\$(cat /proc/cmdline | \
 	    tr ' ' '\n' | \
 	    awk -F'=' ' /^broker-url=/ { print \$2 }')
+SESSIONSELECT=\$(cat /proc/cmdline | \
+	    tr ' ' '\n' | \
+	    awk -F'=' ' /^session=/ { print \$2 }')
 LDAP=\$(cat /proc/cmdline | \
 	    tr ' ' '\n' | \
 	    sed 's/^ldap=/ldap#/' | \
@@ -131,6 +134,9 @@ if grep -q ' bg=' /proc/cmdline; then
 fi
 
 # Spawn X2GoClient
+if [ -n "\$SESSIONSELECT" ]; then
+	STARTSESSION="--session=\$SESSIONSELECT"
+else 
 if [ -n "\$BROKERURL" ]; then
 	SESSIONFROM="--broker-url=\$BROKERURL"
 else 
@@ -174,7 +180,7 @@ if [ -n "\$BLANKINGTIME" ]; then
 	fi
 fi
 
-x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM \$BACKGROUND \$BRANDING
+x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM \$BACKGROUND \$BRANDING \$STARTSESSION
 XSESSION
 
 chown user:user /home/user/.xsession

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