[X2Go-Commits] [live-build-x2go] 29/35: added parameter and directory creation for filesharing support

git-admin at x2go.org git-admin at x2go.org
Fri Apr 28 11:34:24 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 74d354c84196b097f04ac8e658b3982eb29d973e
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Jan 15 17:37:11 2017 +0100

    added parameter and directory creation for filesharing support
---
 config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
index 1f517a0..d6edb63 100755
--- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
@@ -263,12 +263,18 @@ if [ -n "\$BLANKINGTIME" ]; then
 	fi
 fi
 
+<<<<<<< HEAD
 x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM
 >>>>>>> f495c9f... added support for passing of LDAP parameters
+=======
+x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM
+>>>>>>> 75c7143... added parameter and directory creation for filesharing support
 XSESSION
 
 chown user:user /home/user/.xsession
 chmod 644 /home/user/.xsession
+mkdir -p /home/user/export
+mkdir -p /home/user/logins
 
 <<<<<<< HEAD
 <<<<<<< HEAD

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