This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 135d29d update version in man pages new c4dbc5c If x2golistmounts is used with out cmd options <session_id>, then the env var $X2GO_SESSION (current session) will be used. new 6ba4d25 Fix x2gostartagent. Make sure the -nolisten tcp option is configurable via x2goagent.options. (Fixes: #424). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 ++++ x2goserver/bin/x2golistmounts | 2 +- x2goserver/bin/x2gostartagent | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit c4dbc5c407da2bc6fb2169be1441e8b162dcaffd Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 27 14:32:46 2014 +0100 If x2golistmounts is used with out cmd options <session_id>, then the env var $X2GO_SESSION (current session) will be used. --- debian/changelog | 2 ++ x2goserver/bin/x2golistmounts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 46128c2..03e71f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,6 +102,8 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low * New upstream release (4.0.1.14): - Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log. (Fixes: #415). + - If x2golistmounts is used with out cmd options <session_id>, then + the env var $X2GO_SESSION (current session) will be used. * x2goserver.spec: - Let builds for EPEL-7 behave like recent Fedora builds. diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts index 56d3f5f..c05ae2c 100755 --- a/x2goserver/bin/x2golistmounts +++ b/x2goserver/bin/x2golistmounts @@ -29,7 +29,7 @@ use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(loglevel()) ); -my $session_id=shift or die; +my $session_id=shift || $ENV{'X2GO_SESSION'} or die; my $mounts = join("\n", db_getmounts($session_id)); print "$mounts\n"; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 6ba4d2573fb369aa16c6d0843500baa76b920812 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 28 13:12:52 2014 +0100 Fix x2gostartagent. Make sure the -nolisten tcp option is configurable via x2goagent.options. (Fixes: #424). --- debian/changelog | 2 ++ x2goserver/bin/x2gostartagent | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 03e71f3..9f62f6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -104,6 +104,8 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low (Fixes: #415). - If x2golistmounts is used with out cmd options <session_id>, then the env var $X2GO_SESSION (current session) will be used. + - Fix x2gostartagent. Make sure the -nolisten tcp option is configurable + via x2goagent.options. (Fixes: #424). * x2goserver.spec: - Let builds for EPEL-7 behave like recent Fedora builds. diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index edce98b..a171e0c 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -35,7 +35,7 @@ fi X2GO_ROOT="${HOME}/.x2go" export NX_ROOT=$X2GO_ROOT -X2GO_NXAGENT_DEFAULT_OPTIONS="-nolisten tcp" +X2GO_NXAGENT_DEFAULT_OPTIONS="-extension XFIXES -extension GLX -nolisten tcp" if [ -r /etc/x2go/x2goagent.options ]; then source /etc/x2go/x2goagent.options @@ -298,7 +298,7 @@ fi NOLISTOPT="" if [ "$X2GOXDMCP" == "" ] ;then XDMCPOPT="" - if [ "x${X2GO_NXAGENT_OPTIONS}" = "x${X2GO_NXAGENT_OPTIONS/' -nolisten tcp'/''}" ]; then + if [ "x${X2GO_NXAGENT_OPTIONS}" != "x${X2GO_NXAGENT_OPTIONS/' -nolisten tcp'/''}" ]; then NOLISTOPT="-nolisten tcp" fi else -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org