[X2Go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-88-ge88a8aa

X2Go dev team git-admin at x2go.org
Mon Apr 1 19:17:53 CEST 2013


The branch, master has been updated
       via  e88a8aa696de249c9767fbb8eab254642d0eb715 (commit)
      from  e9332a0113cfae33081643087036bcf19b24fdce (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 e88a8aa696de249c9767fbb8eab254642d0eb715
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 1 19:17:25 2013 +0200

    /debian/x2gothinclient.postrm: On action=purge, wait for 20s until x2gothinclientd has stopped.

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

Summary of changes:
 debian/changelog             |    2 ++
 debian/x2gothinclient.postrm |    8 ++++++++
 2 files changed, 10 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f14fff2..caea6d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,6 +76,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
       installed into package.
   * /debian/x2gothinclient.init:
     + Update pointer to X2Go TCE documentation on http://wiki.x2go.org.
+  * /debian/x2gothinclient.postrm:
+    + On action=purge, wait for 20s until x2gothinclientd has stopped.
   * /debian/po/*:
     + Use po-debconf for translating debconf templates. Add German debconf
       translation.
diff --git a/debian/x2gothinclient.postrm b/debian/x2gothinclient.postrm
index ac60f17..1619fd8 100755
--- a/debian/x2gothinclient.postrm
+++ b/debian/x2gothinclient.postrm
@@ -17,6 +17,14 @@ set -e
 
 case "$1" in
 	purge)
+		timer=0
+		while ps ax | grep x2gothinclient | x2gothinclientd 1>/dev/null; do
+			sleep 1
+			timer=$(($timer+1))
+			if [ $timer -gt 20 ]; then
+				# FIXME: kill x2gothinclientd and x2goclient here
+				break
+		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).




More information about the x2go-commits mailing list