[X2Go-Commits] [x2gothinclient] 06/06: usbmount/x2gousbmount: fix desktop/thinclient mode detection. Fixes: #1136.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit c500f9075111a47796f5c5ac8f0846500956d518
Author: Stefan Baur <X2Go-ML-1 at baur-itcs.de>
Date:   Tue Apr 25 22:41:32 2017 +0200

    usbmount/x2gousbmount: fix desktop/thinclient mode detection. Fixes: #1136.
---
 debian/changelog      |  1 +
 usbmount/x2gousbmount | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03a6502..2ed8f9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low
   * usbmount/x2gousbmount:
     - Make user pseudo-selectible via a variable and fix usage across file.
     - Try to create file-sharing facilities harder.
+    - Fix desktop/thinclient mode detection. Fixes: #1136.
 
   [ Mark Pedersen-Cook ]
   * debian/po:
diff --git a/usbmount/x2gousbmount b/usbmount/x2gousbmount
index 5b4d2df..d1d5a45 100755
--- a/usbmount/x2gousbmount
+++ b/usbmount/x2gousbmount
@@ -61,15 +61,27 @@ openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(LOG_NOTICE) );
 
 sub check_x2gothinclientd {
+	my $ret = 0;
+
+	# Check for x2gothinclientd first...
 	my $x=`ps ax | grep x2gothinclient`;
 	if ( $x=~m/thinclientd/ )
 	{
-		return 1;
+		$ret = 1;
+	}
+
+	# And for x2goclient --thinclient if nothing was found.
+	if (!$ret) {
+		$x=`ps u -C x2goclient`;
+		if ( $x=~m/\W*--thinclient\W*/ )
+		{
+			$ret = 1;
+		}
 	}
-	return 0;
+	return $ret;
 }
 
-if ( check_x2gothinclientd() ||  ( -d "/usr/share/doc/x2gothinclient-minidesktop" ) )
+if ( check_x2gothinclientmode() || ( -x "/etc/x2go/x2gothinclient-minidesktop_start" ) )
 {
 
 	open (F,">>/var/log/usb");

--
Alioth's /srv/git/code.x2go.org/x2gothinclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git