[X2Go-Commits] x2gothinclient.git - wheezy-tce (branch) updated: 1.0.1.8-91-gcd7b3e1
X2Go dev team
git-admin at x2go.org
Mon Jul 22 11:14:32 CEST 2013
The branch, wheezy-tce has been updated
via cd7b3e1d876a16aa36afda64f07f281a553a6bd1 (commit)
from dc9aebf35fc177a18cb80d526872217f8c35b2f2 (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/x2gothinclient.postrm | 2 +-
x2gosmartcardrules/x2gognupgccid | 2 +-
x2gousbmount/x2gousbmount | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/x2gothinclient.postrm b/debian/x2gothinclient.postrm
index 4a8284a..4f1e365 100755
--- a/debian/x2gothinclient.postrm
+++ b/debian/x2gothinclient.postrm
@@ -18,7 +18,7 @@ set -e
case "$1" in
purge)
timer=0
- while ps ax | grep x2gothinclient | grep x2gothinclientd 1>/dev/null; do
+ while ps ax | grep x2gothinclient | grep thinclientd 1>/dev/null; do
sleep 1
timer=$(($timer+1))
if [ $timer -gt 20 ]; then
diff --git a/x2gosmartcardrules/x2gognupgccid b/x2gosmartcardrules/x2gognupgccid
index 9632baa..b7715fd 100755
--- a/x2gosmartcardrules/x2gognupgccid
+++ b/x2gosmartcardrules/x2gognupgccid
@@ -23,7 +23,7 @@ GROUP=scard
set -e
# only do this if x2gothinclientd is default display manager, otherwise this makes no sense
-if ps ax | grep x2gothinclient | grep x2gothinclientd 1>/dev/null; then
+if ps ax | grep x2gothinclient | grep thinclientd 1>/dev/null; then
DEV=`echo ${DEVICE} | sed 's/proc/dev/'`
diff --git a/x2gousbmount/x2gousbmount b/x2gousbmount/x2gousbmount
index ca2efa9..0a5123b 100755
--- a/x2gousbmount/x2gousbmount
+++ b/x2gousbmount/x2gousbmount
@@ -23,7 +23,7 @@ use File::Path::Expand;
check_x2gothinclientd() {
my $x=`ps ax | grep x2gothinclient`;
- if ( $x=~m/x2gothinclientd/ )
+ if ( $x=~m/thinclientd/ )
{
return 1;
}
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