[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.0-17-g1af7be0

X2Go dev team git-admin at x2go.org
Wed May 23 08:46:19 CEST 2012


The branch, master has been updated
       via  1af7be02935673fbe6afe3f4ba75d3ae65f6f62e (commit)
      from  b81c5c9784ac0a999d2183b275e0a52300a90184 (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 1af7be02935673fbe6afe3f4ba75d3ae65f6f62e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed May 23 08:46:15 2012 +0200

    Export NX_ROOT=$HOME/.x2go in x2gostartagent. Makes the keyboard file in X2Go session cache directory.

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

Summary of changes:
 debian/changelog              |    2 ++
 x2goserver/bin/x2gostartagent |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 967131b..525dcdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low
     - Complete UNITY/GNOME support for Ubuntu/Debian.
     - Use ,,-nolisten tcp'' option when evoking x2goagent from within
       x2gostartagent.
+    - Export NX_ROOT=$HOME/.x2go in x2gostartagent. Makes the keyboard file
+      in X2Go session cache directory.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 04 Apr 2012 11:44:14 +0200
 
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 29d0302..6531218 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -28,6 +28,8 @@ X2GO_PORT=49 #First port for X2GO=50
 SSH_PORT=30000 #First ssh port 30001
 
 X2GO_ROOT="${HOME}/.x2go"
+export NX_ROOT=$X2GO_ROOT
+
 REMOTE=localhost
 
 X2GO_CLIENT=`echo "$SSH_CLIENT" | awk '{print $1}'`


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