[X2Go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-92-g96176a4

[X2Go dev team]

The branch, master has been updated
       via  96176a41fb69a32aebc04e75e42699ad7bd5b24c (commit)
      from  cd7b3e1d876a16aa36afda64f07f281a553a6bd1 (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 96176a41fb69a32aebc04e75e42699ad7bd5b24c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 1 21:48:20 2013 +0200

    use --retry instead of some complex time construct in postrm

-----------------------------------------------------------------------

Summary of changes:
 debian/x2gothinclient.init   |    2 +-
 debian/x2gothinclient.postrm |    9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

The diff of changes is:
diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init
index 15c0028..f1f6271 100644
--- a/debian/x2gothinclient.init
+++ b/debian/x2gothinclient.init
@@ -78,7 +78,7 @@ case "$1" in
 	stop)
 		if [ -e /var/run/$NAME.pid ]; then
 			log_daemon_msg "Stopping $DESC" "x2gothinclientd"
-			start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid
+			start-stop-daemon --stop --quiet --retry 10 --pidfile /var/run/$NAME.pid
 			log_end_msg $?
 		fi
 	;;
diff --git a/debian/x2gothinclient.postrm b/debian/x2gothinclient.postrm
index 4f1e365..ac60f17 100755
--- a/debian/x2gothinclient.postrm
+++ b/debian/x2gothinclient.postrm
@@ -17,15 +17,6 @@ set -e
 
 case "$1" in
 	purge)
-		timer=0
-		while ps ax | grep x2gothinclient | grep thinclientd 1>/dev/null; do
-			sleep 1
-			timer=$(($timer+1))
-			if [ $timer -gt 20 ]; then
-				# FIXME: kill x2gothinclientd and x2goclient here
-				break
-			fi
-		done
 		getent passwd x2gothinclient >/dev/null && deluser x2gothinclient
 		getent group x2gothinclient >/dev/null && delgroup x2gothinclient
 


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