[X2Go-Commits] [x2gothinclient] 02/03: launch x2gothinclient_init via nodm, which then launches the Xsession

git-admin at x2go.org git-admin at x2go.org
Tue Aug 26 15:49:15 CEST 2014


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

x2go pushed a commit to branch master
in repository x2gothinclient.

commit f1d34ad19a82a2a1f159689447ec0efd0b8b079a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 26 15:45:57 2014 +0200

    launch x2gothinclient_init via nodm, which then launches the Xsession
---
 management/share/etc/x2gothinclient_init |    7 +++++++
 minidesktop/seeds/preseed_nodm           |    1 +
 2 files changed, 8 insertions(+)

diff --git a/management/share/etc/x2gothinclient_init b/management/share/etc/x2gothinclient_init
index 3f922ca..1bbd6c9 100755
--- a/management/share/etc/x2gothinclient_init
+++ b/management/share/etc/x2gothinclient_init
@@ -21,6 +21,9 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 if [ -z "$X2GO_HANDLE_DAEMON" ]; then
+	if [ -d ~x2gothinclient ]; then
+		rm -Rf ~x2gothinclient
+	fi
 	mkdir -p ~x2gothinclient
 	mkdir -p ~x2gothinclient/.x2goclient
 	if [ -e /etc/x2go/x2gothinclient_sessions ]; then
@@ -44,3 +47,7 @@ if [ -z "$X2GO_HANDLE_DAEMON" ]; then
 	chown x2gothinclient:x2gothinclient ~x2gothinclient -Rf
 	chmod go-rwx ~x2gothinclient -Rf
 fi
+
+if [ -e /etc/x2go/x2gothinclient-minidesktop_start ]; then
+	STARTUP=mate-session /etc/X11/Xsession
+fi
diff --git a/minidesktop/seeds/preseed_nodm b/minidesktop/seeds/preseed_nodm
index 8bd287a..13194e6 100755
--- a/minidesktop/seeds/preseed_nodm
+++ b/minidesktop/seeds/preseed_nodm
@@ -33,6 +33,7 @@ do_preseed() {
 do_preseed nodm nodm/enabled boolean true
 do_preseed nodm nodm/user string x2gothinclient
 do_preseed nodm nodm/first_vt 5
+do_preseed nodm nodm/xsession /etc/x2go/x2gothinclient_init
 
 echo "Silently running dpkg-reconfigure on package \"nodm\" ... "
 dpkg -l nodm 1>/dev/null 2>/dev/null && { 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git


More information about the x2go-commits mailing list