Merge remote-tracking branch 'origin/v2.2'

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__)
 
@@ -107,8 +107,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
     )

server/src/uds/transports/X2GO/TX2GOTransport.py

@@ -45,7 +45,7 @@ import logging
 import random
 import string
 
-__updated__ = '2018-03-14'
+__updated__ = '2018-03-22'
 
 logger = logging.getLogger(__name__)
 
@@ -90,6 +90,7 @@ class TX2GOTransport(BaseX2GOTransport):
 
         width, height = CommonPrefs.getWidthHeight(prefs)
 
+        rootless = False
         desktop = self.desktopType.value
         if desktop == "UDSVAPP":
             desktop = "/usr/bin/udsvapp " + self.customCmd.value

server/src/uds/transports/X2GO/X2GOTransport.py

@@ -40,7 +40,7 @@ from . import x2gofile
 
 import logging
 
-__updated__ = '2018-03-14'
+__updated__ = '2018-03-22'
 
 logger = logging.getLogger(__name__)
 
@@ -76,6 +76,7 @@ class X2GOTransport(BaseX2GOTransport):
 
         width, height = CommonPrefs.getWidthHeight(prefs)
 
+        rootless = False
         desktop = self.desktopType.value
         if desktop == "UDSVAPP":
             desktop = "/usr/bin/udsvapp " + self.customCmd.value

server/src/uds/transports/X2GO/scripts/linux/direct.py

@@ -11,7 +11,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)

server/src/uds/transports/X2GO/scripts/linux/tunnel.py

@@ -20,7 +20,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)