[X2Go-Commits] [live-build-x2go] 18/35: added support for passing of LDAP parameters

git-admin at x2go.org git-admin at x2go.org
Fri Apr 28 11:34:22 CEST 2017


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

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

commit 05e845fc890f0ee1162600ebfb9db85b355c6580
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Tue Jul 26 08:59:10 2016 +0200

    added support for passing of LDAP parameters
---
 .../lib/live/config/2800-x2go-thinclientconfig     | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
index 96efbd0..f909a7a 100755
--- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
@@ -101,8 +101,11 @@ openbox &
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 # set screen background to X2Go default blue on all detected screens
 xsetroot -solid "#246ed8"
+=======
+>>>>>>> f495c9f... added support for passing of LDAP parameters
 
 # Get X2GoConfig
 BROKERURL=\$(cat /proc/cmdline | \
@@ -121,6 +124,7 @@ LDAP2=\$(cat /proc/cmdline | \
 	    sed 's/^ldap2=/ldap2#/' | \
 	    awk -F'#' ' /^ldap2#/ { print \$2 }')
 
+<<<<<<< HEAD
 # Spawn X2GoClient
 if [ -n "\$BROKERURL" ]; then
 	SESSIONFROM="--broker-url=\$BROKERURL"
@@ -158,6 +162,27 @@ amixer -q sset PCM 100
 # Spawn X2GoClient
 x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --session-conf=/etc/x2go/x2gothinclient_sessions
 >>>>>>> dd779e0... typofix, and different invocation of pulseaudio
+=======
+# Spawn X2GoClient
+if [ -n "\$BROKERURL" ]; then
+	SESSIONFROM="--broker-url=\$BROKERURL"
+else 
+	SESSIONFROM="--session-conf=/etc/x2go/x2gothinclient_sessions"
+fi
+if [ -n "\$LDAP" ] ; then
+	if [ -n "\$LDAP1" ] ; then
+		BACKUPLDAP="--ldap1=\$LDAP1"
+		if [ -n "\$LDAP2" ] ; then
+			BACKUPLDAP="\$BACKUPLDAP --ldap2=\$LDAP2"
+		fi
+	fi
+	LDAPPARAMS="--ldap=\$LDAP \$BACKUPLDAP"
+else
+	LDAPPARAMS=""
+fi
+ 
+x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM
+>>>>>>> f495c9f... added support for passing of LDAP parameters
 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