[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-110-gd7f1087
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:53:18 CET 2014
The branch, build-baikal has been updated
via d7f10874cafc3113afe50d0e109f084533aace3f (commit)
from d3efa1d588e2fa3a6cd029c2f9af6249a662cc14 (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 | 10 +++++++++-
x2goserver/Makefile | 2 ++
x2goserver/bin/x2gostartagent | 12 ++++++++++--
x2goserver/etc/nxagent.options | 15 +++++++++++++++
4 files changed, 36 insertions(+), 3 deletions(-)
create mode 100644 x2goserver/etc/nxagent.options
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 626101e..18dcfd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,7 +37,15 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
[ Oleksandr Shneyder ]
* Fix SSHFS mounting from Ubuntu clients
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200
+ [ Reinhard Tartler ]
+ * Introduce /etc/x2go/nxagent.options to allow overriding nxagent options
+ This new configuration file specifies default options that clients can
+ override.
+ * Disable XFIXES and GLX. Both are known to cause certain
+ problems. Hopefully we find better solutions so that we can reenable
+ them soon.
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 20 Dec 2012 10:15:26 +0100
x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 53b54c9..e7f83ef 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -67,9 +67,11 @@ install_scripts:
install_config:
$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2go_logout.d
+ $(INSTALL_FILE) etc/nxagent.options $(DESTDIR)$(ETCDIR)/
$(INSTALL_FILE) etc/x2go_logout $(DESTDIR)$(ETCDIR)/
$(INSTALL_FILE) etc/x2go_logout.d/* $(DESTDIR)$(ETCDIR)/x2go_logout.d/
+
install_man:
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index fae66ab..b8f0087 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -30,6 +30,14 @@ SSH_PORT=30000 #First ssh port 30001
X2GO_ROOT="${HOME}/.x2go"
export NX_ROOT=$X2GO_ROOT
+if [ -r /etc/x2go/nxagent.options ]; then
+ source /etc/x2go/nxagent.options
+fi
+
+if [ -z "$X2GO_NXAGENT_OPTIONS" ]; then
+ X2GO_NXAGENT_OPTIONS="$X2GO_NXAGENT_DEFAULT_OPTIONS"
+fi
+
REMOTE=localhost
X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'`
@@ -263,10 +271,10 @@ SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
if [ "$X2GO_STYPE" == "S" ]; then
# set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use
- NX_TEMP=/tmp x2goagent $NOLISTOPT $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" &
+ NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" &
else
# set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use
- NX_TEMP=/tmp x2goagent $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" &
+ NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" &
fi
X2GO_AGENT_PID=$!
diff --git a/x2goserver/etc/nxagent.options b/x2goserver/etc/nxagent.options
new file mode 100644
index 0000000..afe12f9
--- /dev/null
+++ b/x2goserver/etc/nxagent.options
@@ -0,0 +1,15 @@
+#
+# This file can be used to specify default options that are passed to nxagent
+# These options can be overriden by the client!
+
+X2GO_NXAGENT_DEFAULT_OPTIONS=""
+
+# Disable XFIXES.
+# Workaround for https://bugs.launchpad.net/ubuntu/+source/libxfixes/+bug/985202
+#
+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"
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