[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.8-42-g5ea9eaa
X2go dev team
git-admin at x2go.org
Sat Jan 7 08:02:48 CET 2012
The branch, master has been updated
via 5ea9eaad648e916e182ee0c3a56c3c49c97ce80f (commit)
from 59a492c2d3632c68c543da036a742f624431cdcb (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 5ea9eaad648e916e182ee0c3a56c3c49c97ce80f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Jan 7 08:02:41 2012 +0100
fix for LD_LIBRARY_PATH fix (last commit) dropping the X2GO_LIB var completely as it is considered cruft from older versions
-----------------------------------------------------------------------
Summary of changes:
x2goserver/bin/x2gostartagent | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
The diff of changes is:
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 7dd6886..2af8749 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -24,13 +24,6 @@ X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-if [ ! ${LD_LIBRARY_PATH} ] || [ ! ${X2GO_LIB} ]; then
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${X2GO_LIB}"
-else
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${X2GO_LIB}"
-fi
-export LD_LIBRARY_PATH
-
X2GO_PORT=49 #First port for X2GO=50
SSH_PORT=30000 #First ssh port 30001
@@ -246,9 +239,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSIO
SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
if [ "$X2GO_STYPE" == "S" ]; then
- LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth ~/.Xauthority -S -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log &
+ x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth ~/.Xauthority -S -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log &
else
- LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log &
+ x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log &
fi
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