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 c43817e logcheck file: add EOL at EOF new 417d520 Move session file to /tmp/.x2go-$USER. 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 | 3 +++ x2goserver/bin/x2goruncommand | 2 +- x2goserver/bin/x2gostartagent | 29 +++++++++++++++++------------ 3 files changed, 21 insertions(+), 13 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 417d520d2ebbb2a3a146f206995409efb81404d9 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri Jun 27 13:21:52 2014 +0200 Move session file to /tmp/.x2go-$USER. --- debian/changelog | 3 +++ x2goserver/bin/x2goruncommand | 2 +- x2goserver/bin/x2gostartagent | 29 +++++++++++++++++------------ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 665986b..2815154 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,9 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low - Enforce immediate socket cleanup/closure after session suspension and termination. (Fixes: #302). + [ Oleksandr Shneyder ] + * Move session file to /tmp/.x2go-$USER. + -- Mike DePaulo <mikedep333@gmail.com> Thu, 23 Apr 2014 17:49:00 -0500 x2goserver (4.0.1.15-0x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 8c52b2d..eedf59d 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -302,5 +302,5 @@ test -r /etc/x2go/x2go_logout && . /etc/x2go/x2go_logout # clean up session dir if not in debug mode and if session has been successful if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ] && [ "x$successful_run" = "xtrue" ]; then - (sleep 10; rm -Rf "${HOME}/.x2go/C-${X2GO_SESSION}"; rm -f "/tmp/.x2go-${USER}/session-C-${X2GO_SESSION}.log"; rmdir --ignore-fail-on-non-empty "/tmp/.x2go-${USER}"; )& + (sleep 10; rm -f "${HOME}/.x2go/C-${X2GO_SESSION}"; rm -Rf "/tmp/.x2go-${USER}/C-${X2GO_SESSION}"; rmdir --ignore-fail-on-non-empty "/tmp/.x2go-${USER}"; )& fi diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 5687b1b..a2de31d 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -225,26 +225,31 @@ if [ "$X2GO_STYPE" == "S" ]; then X2GO_GEOMETRY=`echo "$X2GO_GEOMETRY" | sed -e "s/-geometry//"` fi -SESSION_DIR="${X2GO_ROOT}/C-${SESSION_NAME}" + +if [ ! -d "$X2GO_ROOT" ]; then + mkdir "$X2GO_ROOT" +fi + +X2GO_TMP_ROOT="/tmp/.x2go-${USER}" +if [ ! -d "$X2GO__TMP_ROOT" ]; then + mkdir "$X2GO_TMP_ROOT" +fi + +SESSION_DIR="${X2GO_TMP_ROOT}/C-${SESSION_NAME}" # do not use $TMP or $TEMP here, the session.log file location has to be accessible by root -SESSION_LOG="/tmp/.x2go-${USER}/session-C-${SESSION_NAME}.log" -mkdir -p $(dirname "${SESSION_LOG}") -chmod -f 0700 $(dirname "${SESSION_LOG}") +SESSION_LOG="${SESSION_DIR}/session.log" +mkdir -p "${SESSION_DIR}" +chmod -f 0700 "${SESSION_DIR}" touch "${SESSION_LOG}" chmod -f 0600 "${SESSION_LOG}" -if [ ! -d "$X2GO_ROOT" ]; then - mkdir "$X2GO_ROOT" -fi if [ ! -d "$X2GO_ROOT/ssh" ]; then - mkdir "$X2GO_ROOT/ssh" + mkdir "$X2GO_ROOT/ssh" fi -if [ ! -d "$SESSION_DIR" ]; then - mkdir "$SESSION_DIR" -fi + X2GO_COOKIE=`mcookie` @@ -310,7 +315,7 @@ else NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" $agent_geometry -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi -ln -s "${SESSION_LOG}" "${SESSION_DIR}/session.log" +ln -s "${SESSION_DIR}" "${X2GO_ROOT}/C-${SESSION_NAME}" X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org