x2goserver.git - master (branch) updated: 3.1.1.3-196-gf09852c - x2go-commits

26 Jul 2013

The branch, master has been updated
       via  f09852cdffd226e1d9aafba985ae124036936760 (commit)
      from  8dc6651a55c7505ab67f367adec97693473f77e2 (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 -----------------------------------------------------------------
commit f09852cdffd226e1d9aafba985ae124036936760
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Jul 26 17:29:27 2013 +0200

    x2goumount-session: allow args $X2GO_SESSION <server-mount-point> in addition to $X2GO_SESSIOn <client-directory>.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    2 ++
 x2goserver/bin/x2goumount-session |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index aff0e2f..c97f2d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,8 @@ x2goserver (4.0.1.4-0~x2go1) UNRELEASED; urgency=low
     - Multiply query USED_DISPLAYS and USED_PORTS in x2gostartagent to minimize
       race conditions in cases where many clients launch session simultaneously.
     - Make X2Go Server aware of the MATE desktop environment.
+    - x2goumount-session: allow args $X2GO_SESSION <server-mount-point> in
+      addition to $X2GO_SESSIOn <client-directory>.
 
   [ Rok Mandeljc ]
   * New upstream version (4.0.1.4):
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index a77f856..14a2279 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -47,7 +47,7 @@ my $mimeboxdir="$tmp_dir/.x2go-$ENV{'USER'}/mimebox";
 
 source_environment(xdg_config_home() . "/user-dirs.dirs");
 
-if ($only_path)
+if (($only_path) && (! $only_path=~m/\/tmp\/.x2go-$uname\/media\/.*/ ))
 {
 	$only_path=~s/\/ramdrive\/mnt\///;
 


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

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 "x2goserver.git" (X2Go Server).

    