x2goserver.git - build-baikal (branch) updated: 4.0.0.1-18-g1341d20 - x2go-commits

18 May 2013

The branch, build-baikal has been updated
       via  1341d206bfb573e3b25d8e22f273daf508a1c107 (commit)
      from  011d14ae076ba6fec96cd1e019c4f82444ab0f9f (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              |    2 ++
 x2goserver/bin/x2gostartagent |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 2cf2dde..89ec4ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
   /debian/control:
     + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes:
       #163).
+    + Create session log symlink after launching x2goagent. Fix order of target
+      and symlink name when executing the command.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Mon, 25 Mar 2013 22:34:11 +0100
 
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 45b3ba5..83e559d 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -209,7 +209,6 @@ mkdir -p $(dirname "${SESSION_LOG}")
 chmod -f 0700 $(dirname "${SESSION_LOG}")
 touch "${SESSION_LOG}"
 chmod -f 0600 "${SESSION_LOG}"
-ln -s "${SESSION_DIR}/session.log" "${SESSION_LOG}"
 
 if [ ! -d "$X2GO_ROOT" ]; then
 	mkdir "$X2GO_ROOT"
@@ -277,6 +276,8 @@ else
 	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
 
+ln -s "${SESSION_LOG}" "${SESSION_DIR}/session.log" 
+
 X2GO_AGENT_PID=$!
 X2GO_AGENT_RETVAL=$?
 test $X2GO_AGENT_RETVAL && {


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).

    