[X2Go-Commits] x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-93-gf839a5a
X2Go dev team
git-admin at x2go.org
Mon Jul 22 11:14:32 CEST 2013
The branch, wheezy-tce has been updated
via f839a5abf03b892d08f5d0a84dbc49330b26e700 (commit)
from 96176a41fb69a32aebc04e75e42699ad7bd5b24c (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:
debian/changelog | 2 ++
x2gothinclient/sbin/x2gothinclientd | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index caea6d6..3714b90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
- Use qx instead of open3 to launch x2goclient. (Fixes: #66).
- Only make x2gousbmount and x2gognupgccid scripts functional if
x2gothinclientd is running.
+ - When finishing x2gothinclientd, wait when killing processes till all
+ processes have vanished. Only kill processes owned by user x2gothinclient.
* /debian/control:
+ Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
+ Priority: optional.
diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd
index 9e86548..08ec9e2 100755
--- a/x2gothinclient/sbin/x2gothinclientd
+++ b/x2gothinclient/sbin/x2gothinclientd
@@ -25,9 +25,9 @@ use IPC::Open3;
sub catch_term
{
- system ("killall x2goclient");
- system ("killall Xorg");
- system ("killall pulseaudio");
+ system ("killall --user x2gothinclient --wait x2goclient");
+ system ("killall --user x2gothinclient --wait Xorg");
+ system ("killall --user x2gothinclient --wait pulseaudio");
unlink("/var/run/x2gothinclient.pid");
exit;
}
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