x2go-commits June 2013

x2go-commits@lists.x2go.org

1 participants
1546 discussions

x2goserver.git - build-main (branch) updated: 4.0.1.1-1-g2f63131
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, build-main has been updated via 2f63131615ef3cdcbabd5bf4e4dee65edbce65b2 (commit) from 9c2ab5674c428fb9417841649b6ebd9f1ca0c503 (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 | 8 ++++++ x2goserver/bin/x2goresume-session | 18 ++----------- x2goserver/sbin/x2gocleansessions | 54 ++++++++++++++++++------------------- 3 files changed, 37 insertions(+), 43 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0603dcc..4bbb5a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2goserver (4.0.1.2-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.1.2): + - Accelerate resuming of sessions. Fix failures when resuming sessions that + result from the latest changes in x2gocleansessions. (Fixes: #247). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 11:01:21 +0200 + x2goserver (4.0.1.1-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.1): diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 9c2eca8..f492d62 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -159,23 +159,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSI rm -Rf $SESSION_DIR/keyboard kill -HUP $X2GO_AGENT_PID &>/dev/null && { - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" - # FIXME: the below code may not be necessary as we fixed a race condition between x2gocleansessions and x2goagent - - # we really have to make sure the session database gets this write operation - # this may just be an SQLite issue so... - # FIXME: probably migrate this piece of code to the SQLite db backend... - #while true; do - # $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null - # if [ $($X2GO_LIB_PATH/x2gogetstatus "$SESSION_NAME") == "R" ]; then - # break; - # else - # $X2GO_LIB_PATH/x2gosyslog "$0" "warning" "failed to write to X2Go db, will try again..." - # sleep 1; - # fi - #done - (sleep 1; $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null;) + $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" # set client-side keyboard model, type, variant, etc. if [ "$X2GO_SET_KBD" != "0" ] && [ "$X2GO_KBD_TYPE" == "auto" ]; then diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 0315a8f..2a69281 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -81,8 +81,6 @@ sub is_running { my $sess=shift; my $user=shift; - my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; - my $text=`tail -1 $log 2>/dev/null`; if (!is_suspended($sess, $user) && !has_terminated($sess, $user)) { return 1; @@ -118,7 +116,7 @@ elsif ($pid == 0 ) $SIG{TERM}=\&catch_term; $SIG{CHLD} = sub { wait }; - my %blocked_sessions = (); + my %remembered_sessions = (); while(sleep 2) { @@ -126,74 +124,76 @@ elsif ($pid == 0 ) my @outp=split("\n","$outp"); # forget earlier remembered blocked sessions - while ( my ($session, $blocked_time) = each(%blocked_sessions) ) + while ( my ($session, $remembered_time) = each(%remembered_sessions) ) { if (! join(',', @outp)=~m/$session/) { - delete $blocked_sessions{$session}; + delete $remembered_sessions{$session}; } } for (my $i=0;$i<@outp;$i++) { + my @sinfo=split('\\|',"@outp[$i]"); - if (@sinfo[4]eq 'F') + + if (defined $remembered_sessions{ @sinfo[1] }) { + $remembered_sessions{ @sinfo[1] } += 2; + } else { + $remembered_sessions{ @sinfo[1] } = 0; + } + if (@sinfo[4]eq 'F') + { syslog('debug', "@sinfo[1] is blocked"); - if (defined $blocked_sessions{ @sinfo[1] }) + if ($remembered_sessions{@sinfo[1]} ge 20) { - $blocked_sessions{@sinfo[1]} += 2; - if ($blocked_sessions{@sinfo[1]} >= 20) - { - # send SIGKILL to dangling X-server processes - syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL"); - qw(kill -9 @sinfo[0]); - delete $blocked_sessions{@sinfo[1]}; - } - } else { - $blocked_sessions{@sinfo[1]} = 0; - syslog('debug', "@sinfo[1]: unmounting all shares"); - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); + # send SIGKILL to dangling X-server processes + syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL"); + qw(kill -9 @sinfo[0]); + delete $remembered_sessions{@sinfo[1]}; } - + syslog('debug', "@sinfo[1]: unmounting all shares"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } + elsif (! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) { - system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'F' @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'F' @sinfo[1] \" 1> /dev/null 2> /dev/null"); syslog('debug', "@sinfo[1], pid @sinfo[0] does not exist, changing status from @sinfo[4] to F"); syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } else { - if (@sinfo[4]eq 'R') + if ( (@sinfo[4] eq 'R') && ( $remembered_sessions{ @sinfo[1] } ge 2 )) { if (is_suspended(@sinfo[1],@sinfo[11])) { - system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] \" 1> /dev/null 2>/dev/null"); syslog('debug', "@sinfo[1] is suspended, changing status from @sinfo[4] to S"); syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } } - if (@sinfo[4]eq 'S') + if (@sinfo[4] eq 'S') { if (is_running(@sinfo[1],@sinfo[11])) { syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); - system("su @sinfo[11] -c \"x2gosuspend-session @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"x2gosuspend-session @sinfo[1] \" 1> /dev/null 2>/dev/null"); syslog('debug', "@sinfo[1] was found running and has now been suspended"); } } - if (@sinfo[4]eq 'T') + if (@sinfo[4] eq 'T') { if (!has_terminated(@sinfo[1],@sinfo[11])) { syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); - system("su @sinfo[11] -c \"x2goterminate-session @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"x2goterminate-session @sinfo[1] \" 1> /dev/null 2>/dev/null"); syslog('debug', "@sinfo[1] has been requested for termination via the session DB"); } } 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-188-g3e017b6
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, master has been updated via 3e017b6dd37da6cef42af819d19c6b002ca96358 (commit) from 435bc378553a215b05ed65e1da3694925972ab63 (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 3e017b6dd37da6cef42af819d19c6b002ca96358 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 11:48:23 2013 +0200 release 4.0.1.2 (cherry-picked from release/4.0.1.x branch) Conflicts (by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 80bcb63..ccf0f40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,13 +51,13 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart(a)tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 -x2goserver (4.0.1.2-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.1.2-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.2): - Accelerate resuming of sessions. Fix failures when resuming sessions that result from the latest changes in x2gocleansessions. (Fixes: #247). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 11:01:21 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 11:48:09 +0200 x2goserver (4.0.1.1-0~x2go1) unstable; urgency=low 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-186-geb1f31f
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, master has been updated via eb1f31f259dd51fcf7245c05e83f3d64371cc261 (commit) from c4f5a92d7ab5f231427d88e5fcc81a24a69faae1 (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 eb1f31f259dd51fcf7245c05e83f3d64371cc261 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 11:07:11 2013 +0200 Revert "Accelerate resuming of sessions. Fix failures when resuming sessions that result from the latest changes in x2gocleansessions." This reverts commit c4f5a92d7ab5f231427d88e5fcc81a24a69faae1. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 -------- x2goserver/bin/x2goresume-session | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d2b7ad9..19a3e4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,14 +51,6 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart(a)tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 -x2goserver (4.0.1.2-0~x2go1) UNRELEASED; urgency=low - - * New upstream version (4.0.1.2): - - Accelerate resuming of sessions. Fix failures when resuming sessions that - result from the latest changes in x2gocleansessions. - - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 11:01:21 +0200 - x2goserver (4.0.1.1-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.1): diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 3d01b0a..75d06d0 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -159,10 +159,24 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSI rm -Rf $SESSION_DIR/keyboard kill -HUP $X2GO_AGENT_PID &>/dev/null && { - - $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" + # FIXME: the below code may not be necessary as we fixed a race condition between x2gocleansessions and x2goagent + + # we really have to make sure the session database gets this write operation + # this may just be an SQLite issue so... + # FIXME: probably migrate this piece of code to the SQLite db backend... + #while true; do + # $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null + # if [ $($X2GO_LIB_PATH/x2gogetstatus "$SESSION_NAME") == "R" ]; then + # break; + # else + # $X2GO_LIB_PATH/x2gosyslog "$0" "warning" "failed to write to X2Go db, will try again..." + # sleep 1; + # fi + #done + (sleep 1; $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null;) + # set client-side keyboard model, type, variant, etc. if [ "$X2GO_SET_KBD" != "0" ] && [ "$X2GO_KBD_TYPE" == "auto" ]; then X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-187-g435bc37
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, master has been updated via 435bc378553a215b05ed65e1da3694925972ab63 (commit) from eb1f31f259dd51fcf7245c05e83f3d64371cc261 (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 435bc378553a215b05ed65e1da3694925972ab63 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 11:46:48 2013 +0200 Accelerate resuming of sessions. Fix failures when resuming sessions that result from the latest changes in x2gocleansessions. (Fixes: #247). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++ x2goserver/bin/x2goresume-session | 18 ++----------- x2goserver/sbin/x2gocleansessions | 54 ++++++++++++++++++------------------- 3 files changed, 37 insertions(+), 43 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 19a3e4d..80bcb63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,14 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart(a)tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 +x2goserver (4.0.1.2-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.1.2): + - Accelerate resuming of sessions. Fix failures when resuming sessions that + result from the latest changes in x2gocleansessions. (Fixes: #247). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 11:01:21 +0200 + x2goserver (4.0.1.1-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.1): diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 75d06d0..3d01b0a 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -159,23 +159,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSI rm -Rf $SESSION_DIR/keyboard kill -HUP $X2GO_AGENT_PID &>/dev/null && { - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" - # FIXME: the below code may not be necessary as we fixed a race condition between x2gocleansessions and x2goagent - - # we really have to make sure the session database gets this write operation - # this may just be an SQLite issue so... - # FIXME: probably migrate this piece of code to the SQLite db backend... - #while true; do - # $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null - # if [ $($X2GO_LIB_PATH/x2gogetstatus "$SESSION_NAME") == "R" ]; then - # break; - # else - # $X2GO_LIB_PATH/x2gosyslog "$0" "warning" "failed to write to X2Go db, will try again..." - # sleep 1; - # fi - #done - (sleep 1; $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null;) + $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" # set client-side keyboard model, type, variant, etc. if [ "$X2GO_SET_KBD" != "0" ] && [ "$X2GO_KBD_TYPE" == "auto" ]; then diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 22edbbd..6dc9b5d 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -79,8 +79,6 @@ sub is_running { my $sess=shift; my $user=shift; - my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; - my $text=`tail -1 $log 2>/dev/null`; if (!is_suspended($sess, $user) && !has_terminated($sess, $user)) { return 1; @@ -116,7 +114,7 @@ elsif ($pid == 0 ) $SIG{TERM}=\&catch_term; $SIG{CHLD} = sub { wait }; - my %blocked_sessions = (); + my %remembered_sessions = (); while(sleep 2) { @@ -124,74 +122,76 @@ elsif ($pid == 0 ) my @outp=split("\n","$outp"); # forget earlier remembered blocked sessions - while ( my ($session, $blocked_time) = each(%blocked_sessions) ) + while ( my ($session, $remembered_time) = each(%remembered_sessions) ) { if (! join(',', @outp)=~m/$session/) { - delete $blocked_sessions{$session}; + delete $remembered_sessions{$session}; } } for (my $i=0;$i<@outp;$i++) { + my @sinfo=split('\\|',"@outp[$i]"); - if (@sinfo[4]eq 'F') + + if (defined $remembered_sessions{ @sinfo[1] }) { + $remembered_sessions{ @sinfo[1] } += 2; + } else { + $remembered_sessions{ @sinfo[1] } = 0; + } + if (@sinfo[4]eq 'F') + { syslog('debug', "@sinfo[1] is blocked"); - if (defined $blocked_sessions{ @sinfo[1] }) + if ($remembered_sessions{@sinfo[1]} ge 20) { - $blocked_sessions{@sinfo[1]} += 2; - if ($blocked_sessions{@sinfo[1]} >= 20) - { - # send SIGKILL to dangling X-server processes - syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL"); - qw(kill -9 @sinfo[0]); - delete $blocked_sessions{@sinfo[1]}; - } - } else { - $blocked_sessions{@sinfo[1]} = 0; - syslog('debug', "@sinfo[1]: unmounting all shares"); - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); + # send SIGKILL to dangling X-server processes + syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL"); + qw(kill -9 @sinfo[0]); + delete $remembered_sessions{@sinfo[1]}; } - + syslog('debug', "@sinfo[1]: unmounting all shares"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } + elsif (! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) { - system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'F' @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'F' @sinfo[1] \" 1> /dev/null 2> /dev/null"); syslog('debug', "@sinfo[1], pid @sinfo[0] does not exist, changing status from @sinfo[4] to F"); syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } else { - if (@sinfo[4]eq 'R') + if ( (@sinfo[4] eq 'R') && ( $remembered_sessions{ @sinfo[1] } ge 2 )) { if (is_suspended(@sinfo[1],@sinfo[11])) { - system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] \" 1> /dev/null 2>/dev/null"); syslog('debug', "@sinfo[1] is suspended, changing status from @sinfo[4] to S"); syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } } - if (@sinfo[4]eq 'S') + if (@sinfo[4] eq 'S') { if (is_running(@sinfo[1],@sinfo[11])) { syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); - system("su @sinfo[11] -c \"x2gosuspend-session @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"x2gosuspend-session @sinfo[1] \" 1> /dev/null 2>/dev/null"); syslog('debug', "@sinfo[1] was found running and has now been suspended"); } } - if (@sinfo[4]eq 'T') + if (@sinfo[4] eq 'T') { if (!has_terminated(@sinfo[1],@sinfo[11])) { syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); - system("su @sinfo[11] -c \"x2goterminate-session @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"x2goterminate-session @sinfo[1] \" 1> /dev/null 2>/dev/null"); syslog('debug', "@sinfo[1] has been requested for termination via the session DB"); } } 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).

1 0

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.1-1-g2f63131
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, release/4.0.1.x has been updated via 2f63131615ef3cdcbabd5bf4e4dee65edbce65b2 (commit) from 9c2ab5674c428fb9417841649b6ebd9f1ca0c503 (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 2f63131615ef3cdcbabd5bf4e4dee65edbce65b2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 11:46:48 2013 +0200 Accelerate resuming of sessions. Fix failures when resuming sessions that result from the latest changes in x2gocleansessions. (Fixes: #247). Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++ x2goserver/bin/x2goresume-session | 18 ++----------- x2goserver/sbin/x2gocleansessions | 54 ++++++++++++++++++------------------- 3 files changed, 37 insertions(+), 43 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0603dcc..4bbb5a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2goserver (4.0.1.2-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.1.2): + - Accelerate resuming of sessions. Fix failures when resuming sessions that + result from the latest changes in x2gocleansessions. (Fixes: #247). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 11:01:21 +0200 + x2goserver (4.0.1.1-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.1): diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 9c2eca8..f492d62 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -159,23 +159,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSI rm -Rf $SESSION_DIR/keyboard kill -HUP $X2GO_AGENT_PID &>/dev/null && { - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" - # FIXME: the below code may not be necessary as we fixed a race condition between x2gocleansessions and x2goagent - - # we really have to make sure the session database gets this write operation - # this may just be an SQLite issue so... - # FIXME: probably migrate this piece of code to the SQLite db backend... - #while true; do - # $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null - # if [ $($X2GO_LIB_PATH/x2gogetstatus "$SESSION_NAME") == "R" ]; then - # break; - # else - # $X2GO_LIB_PATH/x2gosyslog "$0" "warning" "failed to write to X2Go db, will try again..." - # sleep 1; - # fi - #done - (sleep 1; $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null;) + $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" # set client-side keyboard model, type, variant, etc. if [ "$X2GO_SET_KBD" != "0" ] && [ "$X2GO_KBD_TYPE" == "auto" ]; then diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 0315a8f..2a69281 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -81,8 +81,6 @@ sub is_running { my $sess=shift; my $user=shift; - my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; - my $text=`tail -1 $log 2>/dev/null`; if (!is_suspended($sess, $user) && !has_terminated($sess, $user)) { return 1; @@ -118,7 +116,7 @@ elsif ($pid == 0 ) $SIG{TERM}=\&catch_term; $SIG{CHLD} = sub { wait }; - my %blocked_sessions = (); + my %remembered_sessions = (); while(sleep 2) { @@ -126,74 +124,76 @@ elsif ($pid == 0 ) my @outp=split("\n","$outp"); # forget earlier remembered blocked sessions - while ( my ($session, $blocked_time) = each(%blocked_sessions) ) + while ( my ($session, $remembered_time) = each(%remembered_sessions) ) { if (! join(',', @outp)=~m/$session/) { - delete $blocked_sessions{$session}; + delete $remembered_sessions{$session}; } } for (my $i=0;$i<@outp;$i++) { + my @sinfo=split('\\|',"@outp[$i]"); - if (@sinfo[4]eq 'F') + + if (defined $remembered_sessions{ @sinfo[1] }) { + $remembered_sessions{ @sinfo[1] } += 2; + } else { + $remembered_sessions{ @sinfo[1] } = 0; + } + if (@sinfo[4]eq 'F') + { syslog('debug', "@sinfo[1] is blocked"); - if (defined $blocked_sessions{ @sinfo[1] }) + if ($remembered_sessions{@sinfo[1]} ge 20) { - $blocked_sessions{@sinfo[1]} += 2; - if ($blocked_sessions{@sinfo[1]} >= 20) - { - # send SIGKILL to dangling X-server processes - syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL"); - qw(kill -9 @sinfo[0]); - delete $blocked_sessions{@sinfo[1]}; - } - } else { - $blocked_sessions{@sinfo[1]} = 0; - syslog('debug', "@sinfo[1]: unmounting all shares"); - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); + # send SIGKILL to dangling X-server processes + syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL"); + qw(kill -9 @sinfo[0]); + delete $remembered_sessions{@sinfo[1]}; } - + syslog('debug', "@sinfo[1]: unmounting all shares"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } + elsif (! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) { - system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'F' @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'F' @sinfo[1] \" 1> /dev/null 2> /dev/null"); syslog('debug', "@sinfo[1], pid @sinfo[0] does not exist, changing status from @sinfo[4] to F"); syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } else { - if (@sinfo[4]eq 'R') + if ( (@sinfo[4] eq 'R') && ( $remembered_sessions{ @sinfo[1] } ge 2 )) { if (is_suspended(@sinfo[1],@sinfo[11])) { - system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] \" 1> /dev/null 2>/dev/null"); syslog('debug', "@sinfo[1] is suspended, changing status from @sinfo[4] to S"); syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } } - if (@sinfo[4]eq 'S') + if (@sinfo[4] eq 'S') { if (is_running(@sinfo[1],@sinfo[11])) { syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); - system("su @sinfo[11] -c \"x2gosuspend-session @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"x2gosuspend-session @sinfo[1] \" 1> /dev/null 2>/dev/null"); syslog('debug', "@sinfo[1] was found running and has now been suspended"); } } - if (@sinfo[4]eq 'T') + if (@sinfo[4] eq 'T') { if (!has_terminated(@sinfo[1],@sinfo[11])) { syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); - system("su @sinfo[11] -c \"x2goterminate-session @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"x2goterminate-session @sinfo[1] \" 1> /dev/null 2>/dev/null"); syslog('debug', "@sinfo[1] has been requested for termination via the session DB"); } } 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).

1 0

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.1-3-g02ce6b4
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, release/4.0.1.x has been updated via 02ce6b450e39d07617d95e6a334573f3dd31ee8d (commit) from 45a51eb03ed6298e01e34fd8e3fc051d70d3a23f (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 02ce6b450e39d07617d95e6a334573f3dd31ee8d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 11:48:23 2013 +0200 release 4.0.1.2 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4bbb5a6..2798097 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -x2goserver (4.0.1.2-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.1.2-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.2): - Accelerate resuming of sessions. Fix failures when resuming sessions that result from the latest changes in x2gocleansessions. (Fixes: #247). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 11:01:21 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 11:48:09 +0200 x2goserver (4.0.1.1-0~x2go1) unstable; urgency=low 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).

1 0

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.1-2-g45a51eb
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, release/4.0.1.x has been updated via 45a51eb03ed6298e01e34fd8e3fc051d70d3a23f (commit) from 2f63131615ef3cdcbabd5bf4e4dee65edbce65b2 (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 45a51eb03ed6298e01e34fd8e3fc051d70d3a23f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 11:48:01 2013 +0200 increment version on this release branch ----------------------------------------------------------------------- Summary of changes: x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index df80b37..df5bf58 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -4.0.1.1 \ No newline at end of file +4.0.1.2 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index df80b37..df5bf58 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.0.1.1 \ No newline at end of file +4.0.1.2 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index df80b37..df5bf58 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.0.1.1 \ No newline at end of file +4.0.1.2 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index df80b37..df5bf58 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.0.1.1 \ No newline at end of file +4.0.1.2 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index df80b37..df5bf58 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -4.0.1.1 \ No newline at end of file +4.0.1.2 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index df80b37..df5bf58 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.0.1.1 \ No newline at end of file +4.0.1.2 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index df80b37..df5bf58 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.1.1 \ No newline at end of file +4.0.1.2 \ No newline at end of file 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-185-gc4f5a92
by git-admin＠x2go.org 22 Jun '13

22 Jun '13

The branch, master has been updated via c4f5a92d7ab5f231427d88e5fcc81a24a69faae1 (commit) from 307ba7900352f1ef830fb232124f7ef0c8eea590 (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 c4f5a92d7ab5f231427d88e5fcc81a24a69faae1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 22 11:02:52 2013 +0200 Accelerate resuming of sessions. Fix failures when resuming sessions that result from the latest changes in x2gocleansessions. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2goserver/bin/x2goresume-session | 18 ++---------------- 2 files changed, 10 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 19a3e4d..d2b7ad9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,14 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart(a)tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 +x2goserver (4.0.1.2-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (4.0.1.2): + - Accelerate resuming of sessions. Fix failures when resuming sessions that + result from the latest changes in x2gocleansessions. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 11:01:21 +0200 + x2goserver (4.0.1.1-0~x2go1) unstable; urgency=low * New upstream version (4.0.1.1): diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 75d06d0..3d01b0a 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -159,23 +159,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSI rm -Rf $SESSION_DIR/keyboard kill -HUP $X2GO_AGENT_PID &>/dev/null && { - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" - # FIXME: the below code may not be necessary as we fixed a race condition between x2gocleansessions and x2goagent - - # we really have to make sure the session database gets this write operation - # this may just be an SQLite issue so... - # FIXME: probably migrate this piece of code to the SQLite db backend... - #while true; do - # $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null - # if [ $($X2GO_LIB_PATH/x2gogetstatus "$SESSION_NAME") == "R" ]; then - # break; - # else - # $X2GO_LIB_PATH/x2gosyslog "$0" "warning" "failed to write to X2Go db, will try again..." - # sleep 1; - # fi - #done - (sleep 1; $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null;) + $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME" # set client-side keyboard model, type, variant, etc. if [ "$X2GO_SET_KBD" != "0" ] && [ "$X2GO_KBD_TYPE" == "auto" ]; then 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).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.8-114-g0213799
by git-admin＠x2go.org 21 Jun '13

21 Jun '13

The branch, master has been updated via 021379933907c49a8d49436b735c5459ad5d444a (commit) from 66935e87846953e87ab2946cf7db8e8a4293fc5a (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 021379933907c49a8d49436b735c5459ad5d444a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 21 15:25:44 2013 +0200 TCE creation: fix installation path of FreeRDP's known_hosts file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 16c7126..74de118 100644 --- a/debian/changelog +++ b/debian/changelog @@ -67,6 +67,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low and /initrd.img. - Fix shutdown button failures. - TCE management: Do an apt-get clean after TCE creation/upgrade. + - TCE creation: fix installation path of FreeRDP's known_hosts file. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Priority: optional. diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index faa50ee..871778d 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -69,7 +69,7 @@ test -f $TC_CONFIG/x2gothinclient_sessions || cp $SHAREDIR/etc/x2gothinclient_se test -f $TC_CONFIG/x2goclient-background.svg || cp $SHAREDIR/etc/x2goclient-background.svg $TC_CONFIG mkdir -p $TC_CONFIG/freerdp -test -f $TC_CONFIG/freerdp/known_hosts || echo "# X2Go TCE: validate allowed RDP servers with their fingerprints through this file" > $TC_CONFIG/known_hosts +test -f $TC_CONFIG/freerdp/known_hosts || echo "# X2Go TCE: validate allowed RDP servers with their fingerprints through this file" > $TC_CONFIG/freerdp/known_hosts apt-get install debootstrap mkdir -p $TC_CHROOT hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.8-113-g66935e8
by git-admin＠x2go.org 21 Jun '13

21 Jun '13

The branch, master has been updated via 66935e87846953e87ab2946cf7db8e8a4293fc5a (commit) from 0fedd7f92b0ae52b97e5dee43ea559206610bd02 (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 66935e87846953e87ab2946cf7db8e8a4293fc5a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 21 14:47:06 2013 +0200 TCE management: Do an apt-get clean after TCE creation/upgrade. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 2 ++ .../sbin/x2gothinclient_upgrade | 1 + 3 files changed, 4 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d993470..16c7126 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - Fix code that turns absolute symlinks into relative symlink for /vmlinuz and /initrd.img. - Fix shutdown button failures. + - TCE management: Do an apt-get clean after TCE creation/upgrade. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Priority: optional. diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index d2fa78d..faa50ee 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -195,6 +195,8 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf || true [ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf || true +[ \$? -eq 0 ] && apt-get clean + EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index 16abcc5..d35972a 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -72,6 +72,7 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get update [ \$? -eq 0 ] && apt-get upgrade +[ \$? -eq 0 ] && apt-get clean # check for kernel upgrades for symlink in /vmlinuz /vmlinuz.old /initrd.img /initrd.img.old; do hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits June 2013