[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99.10-20-g0253416

X2Go dev team git-admin at x2go.org
Wed Dec 4 06:18:09 CET 2013


The branch, build-main has been updated
       via  0253416b5e4b2e90b0a142b9219c3e808def41d8 (commit)
      from  4f8e5f05cf758b6b7d98cc563da553b05b443cd2 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    2 ++
 x2goserver/bin/x2gomountdirs      |    8 +++++---
 x2goserver/bin/x2goumount-session |    4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 22466d4..ef996c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low
       provided by Milan Knížek (Thanks!).
     - Do not create desktop icons for rootless (i.e. non-desktop) sessions.
     - Allow other $XAUTHORITY values than the default ($HOME/.Xauthority).
+    - For x2gomountdirs / x2goumount-session allow other TMP paths than
+      /tmp. Use ENV{'TMP'} instead, unless it is empty. Then use /tmp.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 01 Feb 2012 13:45:00 +0100
 
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 0b77039..58f3590 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -33,6 +33,8 @@ setlogmask( LOG_UPTO(x2gologlevel()) );
 
 syslog('info', "x2gomountdirs has been called with options: @ARGV");
 
+my $tmp_dir = $ENV{'TMP'} || '/tmp';
+
 my $type=shift;
 my $session=shift;
 my $user=shift;
@@ -98,12 +100,12 @@ close(F);
 chmod(0600,"$key");
 chmod(0600,"$key.ident");
 
-my $mdir="/tmp/$ENV{'USER'}_media";
+my $mdir="$tmp_dir/$ENV{'USER'}_media";
 my $ldir="$ENV{'HOME'}/media";
 my $spooldir_lnk="$ENV{'HOME'}/.x2go/C-$session/spool";
-my $spooldir="/tmp/spool_$ENV{'USER'}";
+my $spooldir="$tmp_dir/spool_$ENV{'USER'}";
 my $mimeboxdir_lnk="$ENV{'HOME'}/.x2go/C-$session/mimebox";
-my $mimeboxdir="/tmp/mimebox_$ENV{'USER'}";
+my $mimeboxdir="$tmp_dir/mimebox_$ENV{'USER'}";
 
 if (! -e $mdir)
 {
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index d9fcdfe..3cf856c 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -34,6 +34,8 @@ setlogmask( LOG_UPTO(x2gologlevel()) );
 
 syslog('info', "x2goumount-session has been called with options: @ARGV");
 
+my $tmp_dir = $ENV{'TMP'} || '/tmp'
+
 my $session=shift;
 my $only_path=shift;
 my $uname=$ENV{'USER'};
@@ -46,7 +48,7 @@ if ($only_path)
 	
 	### FIXME: handle CDROM and Removable Media mounts here, as well!!!
 
-	$only_path="/tmp/$ENV{'USER'}_media/disk/$only_path";
+	$only_path="$tmp_dir/$ENV{'USER'}_media/disk/$only_path";
 	#                                   ^^^^
 	syslog('debug',"x2goumount-session unmounting $only_path only");
 }


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




More information about the x2go-commits mailing list