[X2Go-Commits] x2goserver.git - build-main (branch) updated: 4.0.1.6-15-g4b51ee1

[X2Go dev team]

The branch, build-main has been updated
       via  4b51ee159f35eec9f9e06395ce8d5ee774a9e3ed (commit)
      from  6f0ad622f65788ba4c1249752cb3669a3214c362 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4065c39..2f90765 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low
       x2goserver).
     + Raise Standards: to 3.9.4 (no changes needed).
     + Move xfonts-base to Recommends: field of bin:package x2goserver.
+  * /debian/x2goserver.init:
+    + Make init script LSB compliant.
 
   [ Helmer Teles ]
   * New upstream version (4.0.1.7):
diff --git a/debian/x2goserver.init b/debian/x2goserver.init
index 5ae86e4..d18aaff 100644
--- a/debian/x2goserver.init
+++ b/debian/x2goserver.init
@@ -11,6 +11,8 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 XSOCKDIR=/tmp/.X11-unix
 
+. /lib/lsb/init-functions
+
 start()
 {
 		if [ ! -d $XSOCKDIR ]
@@ -18,8 +20,8 @@ start()
 			mkdir $XSOCKDIR
 			chmod 1777 $XSOCKDIR
 		fi
-		echo "Cleaning up stale X2Go sessions."
-		/usr/sbin/x2gocleansessions
+		log_action_msg "Cleaning up stale X2Go sessions."
+		x2gocleansessions
 }
 
 stop()
@@ -37,11 +39,11 @@ case "$1" in
 	;;
 	reload|force-reload|restart)
 		stop
+		sleep 1
 		start
 	;;
 	*)
 		N=/etc/init.d/x2goserver
-		# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
 		echo "Usage: $N {start|stop|restart|force-reload}" >&2
 		exit 1
 	;;


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