[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-269-g78126d8

[X2go dev team]

The branch, master has been updated
       via  78126d8a6233b275c93b3593ce4acd5dd4a728ac (commit)
      from  3b08cc72667148d6d0ba3bc77f8ac05b8b6c8968 (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 78126d8a6233b275c93b3593ce4acd5dd4a728ac
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Sep 17 01:47:27 2011 +0200

    Fix x2goumount-session for individual paths (folder type: disk), ToDo: folder type CDROM and removable media.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 483245d..f5dcd4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
     rendered by x2golistsessions (and similar) command(s).
   * Silence knotify SIGHUP signals in case that no knotify is running in the
     X2go session.
+  * Fix x2goumount-session for individual paths (folder type: disk),
+    ToDo: folder type CDROM and removable media.
 
   [ Ivan Kabaivanov ]
   * Makefile fix around man page installation in x2goserver-compat package.
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index c85211b..45a4f96 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -43,8 +43,12 @@ if ($only_path)
 {
 	$only_path=~s/\/ramdrive\/mnt\///;
 	$only_path=~ s/\//_/g;
-	my $end="_media";
-	$only_path="$ENV{'HOME'}/media/$only_path";
+	
+	### FIXME: handle CDROM and Removable Media mounts here, as well!!!	
+
+	$only_path="/tmp/$ENV{'USER'}_media/disk/$only_path";
+	#                                   ^^^^
+	syslog('debug',"x2goumount-session unmounting $only_path only");
 }
 
 
@@ -78,6 +82,7 @@ for ($i=0;$i<@outp;$i++)
 	{
 		if (@line[1] ne $only_path)
 		{
+			syslog('debug', "skipping non-requested path @line[1]");
 			goto cont;
 		}
 	}
@@ -144,4 +149,5 @@ cont:
 }
 
 # closing syslog 
-closelog;
\ No newline at end of file
+closelog;
+


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).