The branch, build-baikal has been updated via 429cc9fe5fe724b3a6ac166ed39ba7ee1e9afbb6 (commit) from 54f9ba4f953caaf0390ba4df99df471cd5772060 (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 | 3 ++- x2goserver/bin/x2golistsessions | 2 +- x2goserver/bin/x2goruncommand | 2 +- x2goserver/bin/x2gosuspend-session | 2 +- x2goserver/bin/x2goterminate-session | 2 +- x2goserver/man/man8/x2goumount-session.8 | 8 ++++---- x2goserver/sbin/x2gocleansessions | 6 +++--- 7 files changed, 13 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 332a4d5..be6c54e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low [Mike Gabriel] - * no changes so far + * Rename x2goumount_session calls to x2goumount-session calls in x2goserver + internal scripts. [Martin Oehler] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index ecb497a..0119f3b 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -72,7 +72,7 @@ for(my $i=0;$i<@outp;$i++) { db_changestatus( 'S', @sinfo[1] ); @outp[$i] =~ s/\|R\|/\|S\|/; - system( "x2goumount_session @sinfo[1]"); + system( "x2goumount-session @sinfo[1]"); } } diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index fb33bbe..b639774 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -134,4 +134,4 @@ fi kill -TERM $X2GO_AGENT_PID x2gochangestatus 'F' $X2GO_SESSION > /dev/null export HOSTNAME -x2goumount_session $X2GO_SESSION +x2goumount-session $X2GO_SESSION diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index 9f09e39..1f4084c 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -40,4 +40,4 @@ x2gochangestatus 'S' $SESSION_NAME > /dev/null kill -HUP $X2GO_AGENT_PID export HOSTNAME -x2goumount_session $SESSION_NAME +x2goumount-session $SESSION_NAME diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index e197466..989e272 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -33,4 +33,4 @@ x2gochangestatus 'F' $SESSION_NAME > /dev/null kill -TERM $X2GO_AGENT_PID export HOSTNAME -x2goumount_session $SESSION_NAME +x2goumount-session $SESSION_NAME diff --git a/x2goserver/man/man8/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8 index 6b13592..bdf226c 100644 --- a/x2goserver/man/man8/x2goumount-session.8 +++ b/x2goserver/man/man8/x2goumount-session.8 @@ -5,17 +5,17 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goumount_session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" +.TH x2goumount-session 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" .SH NAME -x2goumount_session \- X2go Server Script +x2goumount-session \- X2go Server Script .SH SYNOPSIS 'nh .fi .ad l -\fBx2goumount_session\fR +\fBx2goumount-session\fR .SH DESCRIPTION -\fBx2goumount_session\fR is one of many scripts belonging to X2go Server. +\fBx2goumount-session\fR is one of many scripts belonging to X2go Server. .PP .SH AUTHOR This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 3787699..14c38ac 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -99,14 +99,14 @@ elsif ($pid == 0 ) { #print "@sinfo[1], is blocked\n"; #print "(@sinfo[1])Unmounting all shares\n"; - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\" 2> /dev/null"); + 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 \"x2gochangestatus 'F' @sinfo[1] \" > /dev/null"); #print "@sinfo[1], pid @sinfo[0] not exist, changing status from @sinfo[4] to F\n"; #print "(@sinfo[1])Unmounting all shares\n"; - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\" 2> /dev/null"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } else { @@ -117,7 +117,7 @@ elsif ($pid == 0 ) system("su @sinfo[11] -c \"x2gochangestatus 'S' @sinfo[1] \" > /dev/null"); #print "@sinfo[1], is suspended, changing status from @sinfo[4] to S\n"; #print "(@sinfo[1])Unmounting all shares\n"; - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\" 2> /dev/null"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } } } 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).