The branch, master has been updated via b4eade6e6f9c503243bba2e26961dce069473fcd (commit) from aed2aa67af3352fd03f7d5986a81804824c38b58 (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 b4eade6e6f9c503243bba2e26961dce069473fcd Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 4 11:44:53 2012 +0200 Make x2gothinclient init script more robust. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2gothinclient.init | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 21123d4..6ea83fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x2gothinclient (1.0.1.8-0~x2go1) UNRELEASED; urgency=low * New upstream version (1.0.1.8): - Remove .halt file before shutting down. + - Make x2gothinclient init script more robust. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 13 Jun 2012 22:27:46 +0200 diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index 7035ca8..3f48c12 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -33,7 +33,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin export HOSTNAME DAEMON=/usr/sbin/x2gothinclientd NAME=x2gothinclient -DESC=x2gothinclient +DESC="X2Go Thinclient Service" test -x $DAEMON || exit 0 test -x /etc/x2go/x2gothinclient_init || test -x /etc/x2go/x2gothinclient_start || { echo "X2go thin client system will not start as it is not configured, yet.\nSee http://wiki.x2go.org/installing_x2go_thin_client_environment_debian"; exit 0; } @@ -52,9 +52,7 @@ case "$1" in ;; stop) echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid - - echo "$NAME." + start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid && echo "$NAME." || echo "not running" ;; #reload) # @@ -82,12 +80,9 @@ case "$1" in ;; restart) echo -n "Restarting $DESC: " - start-stop-daemon --stop --quiet --pidfile \ - /var/run/$NAME.pid + $0 stop sleep 1 - start-stop-daemon --start --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." + $0 start ;; *) N=/etc/init.d/$NAME hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).