[X2Go-Commits] x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.3-5-g340d48a

[X2Go dev team]

The branch, release/4.0.1.x has been updated
       via  340d48a5de872145f472a8d49a62e58569639b3e (commit)
      from  2085cb616182aa47e7233ffbe72a5b45349ed508 (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 340d48a5de872145f472a8d49a62e58569639b3e
Author: Mike Gabriel <mike.gabriel at 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 954e75d..ca91a38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,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 3c3dc20..ccd23ff 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -71,7 +71,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).