The branch, build-main has been updated via 111c8e9da59660fb68473111fb0a32c7106a1170 (commit) via 88d814adc6cc578c0e43806a29f5643451f58894 (commit) via bf757b40e4a378e416aefa140bd27222ef7b816d (commit) via ff471f1564e8de9c229abe408d5324fe48a51b40 (commit) via aa9d755a0ffbe67b1cd7e02ec4fc0fae08f96a6b (commit) via b4eade6e6f9c503243bba2e26961dce069473fcd (commit) via aed2aa67af3352fd03f7d5986a81804824c38b58 (commit) via e61158f8989d9d1e4a978dd61ba756714201a1bf (commit) from 9b226f75d415bbd2f1f2b41b53768a255055314e (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: VERSION | 2 +- debian/changelog | 11 +++++++++++ debian/x2gothinclient.init | 19 +++++++++---------- x2gothinclient/sbin/x2gothinclientd | 3 +++ 4 files changed, 24 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index ff27689..ef86402 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1.7 +1.0.1.8 diff --git a/debian/changelog b/debian/changelog index 1555460..a8f76d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +x2gothinclient (1.0.1.8-0~x2go1) unstable; urgency=low + + * New upstream version (1.0.1.8): + - Remove .halt file before shutting down. + - Make x2gothinclient init script more robust. + - Stop x2gothinclient init script if either x2gothinclient_init or + x2gothinclient_start is missing/non-executable. + - Fix spelling of X2Go. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 10 Aug 2012 10:44:07 +0200 + x2gothinclient (1.0.1.7-0~x2go1) unstable; urgency=low * New upstream version (1.0.1.7): diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index 7035ca8..42866d3 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -33,10 +33,14 @@ 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; } +if [ ! -x /etc/x2go/x2gothinclient_init ] || [ ! -x /etc/x2go/x2gothinclient_start ]; then + echo "X2Go Thin Client system will not start as it is not configured, yet." + echo "See http://wiki.x2go.org/installing_x2go_thin_client_environment_debian" + exit 0 +fi # pre-init X2Go Thin Client through init script... test -x /etc/x2go/x2gothinclient_init && . /etc/x2go/x2gothinclient_init @@ -52,9 +56,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 +84,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 diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 49e04a9..d3be9a7 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -63,6 +63,9 @@ sub check_client return 0; } +# make sure the .halt file is not present when we start this script +system("rm -f /home/x2goclient/.halt"); + # pre-load the thinclient initialization script system("su x2goclient -c \". /etc/x2go/x2gothinclient_init\""); 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).