[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-10-gc955ffb

[X2Go dev team]

The branch, build-baikal has been updated
       via  c955ffbf33840777e63e05c9ce747134736cc328 (commit)
      from  10adb53130babfbf300af90978d4d6169c8614c3 (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/x2goserver.init |   63 +++++-------------------------------------------
 1 file changed, 6 insertions(+), 57 deletions(-)

The diff of changes is:
diff --git a/debian/x2goserver.init b/debian/x2goserver.init
index 40fb531..e6285b6 100644
--- a/debian/x2goserver.init
+++ b/debian/x2goserver.init
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/sh -e
 ### BEGIN INIT INFO
 # Provides:          x2goserver
 # Required-Start:    $remote_fs $syslog
@@ -9,68 +9,17 @@
 ### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-export HOSTNAME
-DAEMON=/usr/sbin/x2gocleansessions
-NAME=x2goserver
-DESC=x2goserver
-
-test -x $DAEMON || exit 0
-
-# Include x2goserver defaults if available
-if [ -f /etc/default/x2goserver ] ; then
-	. /etc/default/x2goserver
-fi
-
-set -e
 
 case "$1" in
   start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid 
-	
-	echo "$NAME."
-	;;
-  #reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
-  #;;
-  force-reload)
-	#
-	#	If the "reload" option is implemented, move the "force-reload"
-	#	option to the "reload" entry above. If not, "force-reload" is
-	#	just the same as "restart" except that it does nothing if the
-	#   daemon isn't already running.
-	# check wether $DAEMON is running. If so, restart
-	start-stop-daemon --stop --test --quiet --pidfile \
-		/var/run/$NAME.pid  \
-	&& $0 restart \
-	|| exit 0
+	echo "Cleaning up stale x2go sessions."
+        /usr/sbin/x2gocleansessions
 	;;
-  restart)
-    echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --oknodo --quiet --pidfile \
-		/var/run/$NAME.pid 
-	sleep 1
-	start-stop-daemon --start --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
+  stop|reload|force-reload|restart)
+        # nothing to do
 	;;
   *)
-	N=/etc/init.d/$NAME
+	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).