The branch, master has been updated via c3a457cf4ffe605dc8d200084925ad9fe5812171 (commit) via 5cd74c75ba45c8844686e1e8bdca74dee28a6149 (commit) from 6c88e6857b0742963705e35a44d889d8a8becab4 (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 c3a457cf4ffe605dc8d200084925ad9fe5812171 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Feb 25 11:05:15 2012 +0100 Be tolerant against x2go_logout script failures. commit 5cd74c75ba45c8844686e1e8bdca74dee28a6149 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Feb 25 11:03:15 2012 +0100 Do only run session cleanup scripts from within x2goruncommand. Dropping them from x2goterminate-session. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2goserver/bin/x2goruncommand | 3 +++ x2goserver/bin/x2goterminate-session | 9 --------- x2goserver/etc/x2go_logout | 3 ++- 4 files changed, 8 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index aa623c8..d5664c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ x2goserver (3.1.0.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.1.0.1): - Provide infrastructure for on-logout script calls. + - Do only run session cleanup scripts from within + x2goruncommand. Dropping them from x2goterminate-session. + - Be tolerant against x2go_logout script failures. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Feb 2012 15:10:12 +0100 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 0a664b6..fd9f82d 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -167,6 +167,9 @@ $X2GO_LIB_PATH/x2gochangestatus 'F' "$X2GO_SESSION" > /dev/null export HOSTNAME x2goumount-session "$X2GO_SESSION" +# run logout scripts +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")& diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 8743d7d..a661dfc 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -60,13 +60,4 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && { } -export HOSTNAME -x2goumount-session "$SESSION_NAME" -# run logout scripts -test -r /etc/x2go/x2go_logout && . /etc/x2go/x2go_logout - -# if we are not running in log level debug (=7) then clean up session dir -if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ]; then - (sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")& -fi diff --git a/x2goserver/etc/x2go_logout b/x2goserver/etc/x2go_logout index b32fde1..39296d6 100644 --- a/x2goserver/etc/x2go_logout +++ b/x2goserver/etc/x2go_logout @@ -4,7 +4,8 @@ if [ -d /etc/x2go/x2go_logout.d ]; then for subscript in /etc/x2go_logout.d/*; do if [ -r $subscript ]; then - . $subscript + # subscripts may fail, we ignore that here... + . $subscript || true fi done unset subscript 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).