From 9c65db5c2532d7633cbbbaf520f588bd0a58eabf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= <dkmaster@dkmon.com>
Date: Fri, 23 Mar 2018 10:39:34 +0100
Subject: [PATCH] X2go fixes

---
 server/src/uds/transports/X2GO/BaseX2GOTransport.py    | 6 +++---
 server/src/uds/transports/X2GO/scripts/linux/direct.py | 2 +-
 server/src/uds/transports/X2GO/scripts/linux/tunnel.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/src/uds/transports/X2GO/BaseX2GOTransport.py b/server/src/uds/transports/X2GO/BaseX2GOTransport.py
index f12eb4dfa..2f51060ea 100644
--- a/server/src/uds/transports/X2GO/BaseX2GOTransport.py
+++ b/server/src/uds/transports/X2GO/BaseX2GOTransport.py
@@ -47,7 +47,7 @@ import six
 import os
 import logging
 
-__updated__ = '2017-12-20'
+__updated__ = '2018-03-23'
 
 logger = logging.getLogger(__name__)
 
@@ -108,8 +108,8 @@ class BaseX2GOTransport(Transport):
 
     exports = gui.CheckBoxField(
         order=14,
-        label=_('Redirect root folder'),
-        tooltip=_('If checked, user home folder will be redirected'),
+        label=_('Redirect home folder'),
+        tooltip=_('If checked, user home folder will be redirected. (On linux, also redirects /media)'),
         defvalue=gui.FALSE,
         tab=gui.PARAMETERS_TAB
     )
diff --git a/server/src/uds/transports/X2GO/scripts/linux/direct.py b/server/src/uds/transports/X2GO/scripts/linux/direct.py
index 7e5e13f46..3ac06d264 100644
--- a/server/src/uds/transports/X2GO/scripts/linux/direct.py
+++ b/server/src/uds/transports/X2GO/scripts/linux/direct.py
@@ -12,7 +12,7 @@ from uds import tools  # @UnresolvedImport
 
 import six
 
-home = expanduser('~') + ':1;'
+home = expanduser('~') + ':1;/media:1;'
 keyFile = tools.saveTempFile('''{m.key}''')
 theFile = '''{m.xf}'''.format(export=home, keyFile=keyFile.replace('\\', '/'), ip='{m.ip}', port='22')
 filename = tools.saveTempFile(theFile)
diff --git a/server/src/uds/transports/X2GO/scripts/linux/tunnel.py b/server/src/uds/transports/X2GO/scripts/linux/tunnel.py
index 4aa4fa97b..f0f3b5246 100644
--- a/server/src/uds/transports/X2GO/scripts/linux/tunnel.py
+++ b/server/src/uds/transports/X2GO/scripts/linux/tunnel.py
@@ -21,7 +21,7 @@ if forwardThread.status == 2:
 
 tools.addTaskToWait(forwardThread)
 
-home = expanduser('~') + ':1;'
+home = expanduser('~') + ':1;/media:1;'
 keyFile = tools.saveTempFile('''{m.key}''')
 theFile = '''{m.xf}'''.format(export=home, keyFile=keyFile.replace('\\', '/'), ip='127.0.0.1', port=port)
 filename = tools.saveTempFile(theFile)