The branch, master has been updated via aa9d755a0ffbe67b1cd7e02ec4fc0fae08f96a6b (commit) from b4eade6e6f9c503243bba2e26961dce069473fcd (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 aa9d755a0ffbe67b1cd7e02ec4fc0fae08f96a6b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 4 11:56:20 2012 +0200 check for .halt file earlier in x2gothinclientd script ----------------------------------------------------------------------- Summary of changes: x2gothinclient/sbin/x2gothinclientd | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 68ed553..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\""); @@ -92,7 +95,6 @@ elsif ($pid == 0 ) # test if shutdown button on X2Go Client was clicked if ( -e "/home/x2goclient/.halt") { - system("rm -f /home/x2goclient/.halt"); system("shutdown -h now"); } # test if XServer is running, if not launch it... 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).