This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from 50018d3 If x2golistmounts is used with out cmd options <session_id>, then the env var $X2GO_SESSION (current session) will be used. new 4a1a3aa Fix x2gostartagent. Make sure the -nolisten tcp option is configurable via x2goagent.options. (Fixes: #424). The 1 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 | 2 ++ x2goserver/bin/x2gostartagent | 4 ++-- 2 files changed, 4 insertions(+), 2 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 release/4.0.1.x in repository x2goserver. commit 4a1a3aa99459bf2dbee4f141de1b9a8c667a49f2 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 84ac01b..6381e14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,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 a25fda1..2295cdc 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 @@ -287,7 +287,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