The branch, build-baikal has been updated via 11c950ceffccdf78b2da5db02f33327b52dc1d04 (commit) from da4800f1505c62f65d8d91fbb7ad5d7de21ce2e3 (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/x2goresume-session | 3 +++ x2goserver/bin/x2gosuspend-session | 3 +++ x2goserver/bin/x2goterminate-session | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 72acfab..df9fede 100644 --- a/debian/changelog +++ b/debian/changelog @@ -99,6 +99,8 @@ x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low x2gocleansessions. * Terminate x2godesktopsharing for current session on x2goterminate-session or when x2goruncommand is about to exit. + * Resume/suspend x2godesktopsharing during x2goresume-session, + x2gosuspend-session. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 5fa453a..d9c7345 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -94,3 +94,6 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && { # If this happens than we mark the session as finished... $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null } + +# resume x2godesktopsharing, if it has been in use before the session got suspended +x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2godesktopsharing_resume $SESSION_NAME diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index 973edc9..3c554e7 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -38,6 +38,9 @@ killall -HUP knotify &>/dev/null $X2GO_LIB_PATH/x2gochangestatus 'S' $SESSION_NAME > /dev/null +# terminate x2godesktopsharing instance and remember that it was running... +x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2godesktopsharing-suspend $SESSION_NAME + kill -HUP $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has been suspended successfully" } || { diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 50357f3..ca283e1 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -36,7 +36,7 @@ X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null # stop x2godesktopsharing process gracefully... -x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2godesktopsharing-terminate $SESSION_NAME +x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2godesktopsharing-terminate $SESSION_NAME kill -TERM $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has been terminated successfully" 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).