[X2Go-Commits] x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.9-16-g13ec71f
X2Go dev team
git-admin at x2go.org
Tue Dec 10 09:51:30 CET 2013
The branch, release/4.0.1.x has been updated
via 13ec71f7df3efae239c2dbe96a5abe9370fa7b2f (commit)
from 855c9257bed7568482f3ccf042574ee91dca7d15 (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 13ec71f7df3efae239c2dbe96a5abe9370fa7b2f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Dec 10 09:36:44 2013 +0100
Handle TCP listening of x2goagent in x2goagent.options. (Fixes: #354).
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2goserver/bin/x2gostartagent | 6 +++++-
x2goserver/etc/x2goagent.options | 11 ++++++++++-
3 files changed, 16 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3a54b9d..9c562e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low
- x2goserver-fmbindings/Makefile: install share/applications and share/mime.
- x2goserver-printing/Makefile: create feature.d directory before installing
files into it.
+ - Handle TCP listening of x2goagent in x2goagent.options. (Fixes: #354).
* Grab systemd service file from Fedora and ship it upstream.
* Add init script for RPM based distro. Taken from the Fedora
package.
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index df6aea1..2c2534e 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -35,6 +35,8 @@ fi
X2GO_ROOT="${HOME}/.x2go"
export NX_ROOT=$X2GO_ROOT
+X2GO_NXAGENT_DEFAULT_OPTIONS="-nolisten tcp"
+
if [ -r /etc/x2go/x2goagent.options ]; then
source /etc/x2go/x2goagent.options
fi
@@ -282,7 +284,9 @@ fi
NOLISTOPT=""
if [ "$X2GOXDMCP" == "" ] ;then
XDMCPOPT=""
- NOLISTOPT="-nolisten tcp"
+ if [ "x${X2GO_NXAGENT_OPTIONS}" = "x${X2GO_NXAGENT_OPTIONS/' -nolisten tcp'/''}" ]; then
+ NOLISTOPT="-nolisten tcp"
+ fi
else
XDMCPOPT="-query $X2GOXDMCP"
fi
diff --git a/x2goserver/etc/x2goagent.options b/x2goserver/etc/x2goagent.options
index afe12f9..fbf4a01 100644
--- a/x2goserver/etc/x2goagent.options
+++ b/x2goserver/etc/x2goagent.options
@@ -12,4 +12,13 @@ X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension XFIXES"
# Disable GLX, the old mesa version is hopelessly outdated anyways.
# Unbreaks the gnome3 control center
#
-X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension GLX"
+#X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension GLX"
+
+# Launch X2Go's X-server x2goagent with option "-nolisten tcp".
+#
+# This is the default setting and the X2Go developers really recommend not to
+# touch this. However, if you play with this (i.e. if you comment it out) you
+# should really know what you are doing.
+#
+# For everyone else: don't touch the line below!!!
+X2GO_NXAGENT_DEFAULT_OPTIONS+=" -nolisten tcp"
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