[X2Go-Commits] x2gothinclient.git - build-main (branch) updated: 1.0.1.8-37-g97b0ada

[X2Go dev team]

The branch, build-main has been updated
       via  97b0adae0dd42a1dd1d7d44fb564a875192281c4 (commit)
      from  9af63fad8282f9d61b982501178b7b687804170b (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                    |    1 +
 x2gothinclient/sbin/x2gothinclientd |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 08e9201..f1f62e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
     - Add direct FreeRDP support for defaults TCE installation.
     - Start with US keyboard as default keyboard layout.
     - Only mount /proc, /sys, /dev/pts inside chroot if not already mounted.
+    - Xorg appears as /usr/bin/X in ps ax output. Make sure it gets detected.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 10 Aug 2012 14:13:49 +0200
 
diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd
index 61bd512..f822454 100755
--- a/x2gothinclient/sbin/x2gothinclientd
+++ b/x2gothinclient/sbin/x2gothinclientd
@@ -33,8 +33,8 @@ sub catch_term
 
 sub check_x
 {
-	my $x=`ps ax | grep Xorg`;
-	if ( $x=~m/usr.bin.Xorg/ )
+	my $x=`ps ax | grep X`;
+	if ( $x=~m/usr.bin.(Xorg|X)/ )
 	{
 		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).