[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-111-gb3d9404

[X2Go dev team]

The branch, master has been updated
       via  b3d9404c654c051875a1f3abcbd3ff81aa6780b7 (commit)
      from  d7f10874cafc3113afe50d0e109f084533aace3f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b3d9404c654c051875a1f3abcbd3ff81aa6780b7
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Thu Dec 20 13:03:58 2012 +0100

    create /tmp/.X11-unix if not exists

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog       |    1 +
 debian/x2goserver.init |   30 ++++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 18dcfd6..7d734c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
 
   [ Oleksandr Shneyder ]
   * Fix SSHFS mounting from Ubuntu clients
+  * create /tmp/.X11-unix if not exists
 
   [ Reinhard Tartler ]
   * Introduce /etc/x2go/nxagent.options to allow overriding nxagent options
diff --git a/debian/x2goserver.init b/debian/x2goserver.init
index b56a4cb..5ae86e4 100644
--- a/debian/x2goserver.init
+++ b/debian/x2goserver.init
@@ -9,21 +9,35 @@
 ### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+XSOCKDIR=/tmp/.X11-unix
 
-case "$1" in
-	start)
+start()
+{
+		if [ ! -d $XSOCKDIR ]
+		then
+			mkdir $XSOCKDIR
+			chmod 1777 $XSOCKDIR
+		fi
 		echo "Cleaning up stale X2Go sessions."
 		/usr/sbin/x2gocleansessions
-	;;
-	stop)
+}
+
+stop()
+{
 		# kill x2gocleansessions, ignore on failure
 		killall x2gocleansessions || true
+}
+
+case "$1" in
+	start)
+		start
+	;;
+	stop)
+		stop
 	;;
 	reload|force-reload|restart)
-		# kill x2gocleansessions, ignore on failure
-		killall x2gocleansessions || true
-		echo "Cleaning up stale X2Go sessions."
-		/usr/sbin/x2gocleansessions
+		stop
+		start
 	;;
 	*)
 		N=/etc/init.d/x2goserver


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).