[X2Go-Commits] [x2gothinclient] 02/02: usbmount/x2gousbmount: set default username to x2gothinclient for MATE minidesktop builds, even for X2GO TCE Live builds.

git-admin at x2go.org git-admin at x2go.org
Mon Nov 20 03:28:56 CET 2017


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

x2go pushed a commit to branch master
in repository x2gothinclient.

commit 95c1550d09a7c3ea801f078fbdb51bd6c6658a40
Author: Stefan Baur <X2Go-ML-1 at baur-itcs.de>
Date:   Mon Nov 20 03:28:32 2017 +0100

    usbmount/x2gousbmount: set default username to x2gothinclient for MATE minidesktop builds, even for X2GO TCE Live builds.
---
 debian/changelog      |  2 ++
 usbmount/x2gousbmount | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d74fcb..02d54d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,6 +87,8 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low
     - 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.
+    - Set default username to x2gothinclient for MATE minidesktop builds, even
+      for X2GO TCE Live builds.
 
   [ Mark Pedersen-Cook ]
   * debian/po:
diff --git a/usbmount/x2gousbmount b/usbmount/x2gousbmount
index d1d5a45..12d8535 100755
--- a/usbmount/x2gousbmount
+++ b/usbmount/x2gousbmount
@@ -23,9 +23,22 @@ use File::Path::Expand;
 use Sys::Syslog qw( :standard :macros );
 
 my $user;
-if ( -d "/lib/live/config" ) {
+if ( -f "/etc/x2go/x2gothinclient-minidesktop_start" ) {
+	# this is a minidesktop environment, which uses
+	# username "x2gothinclient" regardless of whether
+	# it runs on X2Go-TCE-Live or X2Go-TCE-NFS
+	$user='x2gothinclient';
+}
+elsif ( -d "/lib/live/config" ) {
+	# this is X2Go-TCE-Live, but not with a minidesktop
+	# (if it were, the first condition would have matched),
+	# so we use Debian-Live's standard username "user"
 	$user='user';
-} else {
+}
+else {
+	# this is X2Go-TCE-NFS or something completely different,
+	# so we'll play it safe and pick the username "x2gothinclient"
+	# just like previous versions of this script did
 	$user='x2gothinclient';
 }
 

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


More information about the x2go-commits mailing list