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 9c4a449 release 4.0.1.17 new 84e927f Continue development... new 0174a52 Remove stale X11 lock files in cases where x2goagent mysteriously disappeared (e.g., due to kill -9 or a crash). (Fixes: #630). The 2 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 | 9 +++++++++ x2goserver.spec | 2 +- x2goserver/VERSION.x2goserver | 2 +- x2goserver/man/man5/x2goserver.conf.5 | 2 +- x2goserver/man/man8/x2gobasepath.8 | 2 +- x2goserver/man/man8/x2gocleansessions.8 | 2 +- x2goserver/man/man8/x2gocmdexitmessage.8 | 2 +- x2goserver/man/man8/x2godbadmin.8 | 2 +- x2goserver/man/man8/x2gofeature.8 | 2 +- x2goserver/man/man8/x2gofeaturelist.8 | 2 +- x2goserver/man/man8/x2gogetservers.8 | 2 +- x2goserver/man/man8/x2golistdesktops.8 | 2 +- x2goserver/man/man8/x2golistmounts.8 | 2 +- x2goserver/man/man8/x2golistsessions.8 | 2 +- x2goserver/man/man8/x2golistsessions_root.8 | 2 +- x2goserver/man/man8/x2gomountdirs.8 | 2 +- x2goserver/man/man8/x2gopath.8 | 2 +- x2goserver/man/man8/x2goresume-session.8 | 2 +- x2goserver/man/man8/x2goruncommand.8 | 2 +- x2goserver/man/man8/x2gosessionlimit.8 | 2 +- x2goserver/man/man8/x2gosetkeyboard.8 | 2 +- x2goserver/man/man8/x2goshowblocks.8 | 2 +- x2goserver/man/man8/x2gostartagent.8 | 2 +- x2goserver/man/man8/x2gosuspend-session.8 | 2 +- x2goserver/man/man8/x2goterminate-session.8 | 2 +- x2goserver/man/man8/x2goumount-session.8 | 2 +- x2goserver/man/man8/x2goversion.8 | 2 +- x2goserver/sbin/x2gocleansessions | 12 +++++++++++- 28 files changed, 46 insertions(+), 27 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 84e927febaf065c7b2ff5cc9ee9c9e437ff3fd02 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 6 22:14:16 2014 +0200 Continue development... --- debian/changelog | 6 ++++++ x2goserver.spec | 2 +- x2goserver/VERSION.x2goserver | 2 +- x2goserver/man/man5/x2goserver.conf.5 | 2 +- x2goserver/man/man8/x2gobasepath.8 | 2 +- x2goserver/man/man8/x2gocleansessions.8 | 2 +- x2goserver/man/man8/x2gocmdexitmessage.8 | 2 +- x2goserver/man/man8/x2godbadmin.8 | 2 +- x2goserver/man/man8/x2gofeature.8 | 2 +- x2goserver/man/man8/x2gofeaturelist.8 | 2 +- x2goserver/man/man8/x2gogetservers.8 | 2 +- x2goserver/man/man8/x2golistdesktops.8 | 2 +- x2goserver/man/man8/x2golistmounts.8 | 2 +- x2goserver/man/man8/x2golistsessions.8 | 2 +- x2goserver/man/man8/x2golistsessions_root.8 | 2 +- x2goserver/man/man8/x2gomountdirs.8 | 2 +- x2goserver/man/man8/x2gopath.8 | 2 +- x2goserver/man/man8/x2goresume-session.8 | 2 +- x2goserver/man/man8/x2goruncommand.8 | 2 +- x2goserver/man/man8/x2gosessionlimit.8 | 2 +- x2goserver/man/man8/x2gosetkeyboard.8 | 2 +- x2goserver/man/man8/x2goshowblocks.8 | 2 +- x2goserver/man/man8/x2gostartagent.8 | 2 +- x2goserver/man/man8/x2gosuspend-session.8 | 2 +- x2goserver/man/man8/x2goterminate-session.8 | 2 +- x2goserver/man/man8/x2goumount-session.8 | 2 +- x2goserver/man/man8/x2goversion.8 | 2 +- 27 files changed, 32 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6e94a0..64683f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goserver (4.0.1.18-0x2go1) UNRELEASED; urgency=medium + + * Continue development... + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 06 Oct 2014 22:13:22 +0200 + x2goserver (4.0.1.17-0x2go1) unstable; urgency=medium * New upstream release (4.0.1.17): diff --git a/x2goserver.spec b/x2goserver.spec index e142d0c..70c956b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -1,5 +1,5 @@ Name: x2goserver -Version: 4.0.1.16 +Version: 4.0.1.18 Release: 0.0x2go1%{?dist} Summary: X2Go Server diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 7c01c1d..248d822 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.1.17 +4.0.1.18 diff --git a/x2goserver/man/man5/x2goserver.conf.5 b/x2goserver/man/man5/x2goserver.conf.5 index 775951f..3858024 100644 --- a/x2goserver/man/man5/x2goserver.conf.5 +++ b/x2goserver/man/man5/x2goserver.conf.5 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goserver.conf 5 "Okt 2014" "Version 4.0.1.17" "X2Go Server Configuration" +.TH x2goserver.conf 5 "Okt 2014" "Version 4.0.1.18" "X2Go Server Configuration" .SH NAME x2goserver.conf \- X2Go Server Main Configuration File .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gobasepath.8 b/x2goserver/man/man8/x2gobasepath.8 index c319c26..a7d849a 100644 --- a/x2goserver/man/man8/x2gobasepath.8 +++ b/x2goserver/man/man8/x2gobasepath.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobasepath 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2gobasepath 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2gobasepath \- Detect Base Path of X2Go Server Installation .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gocleansessions.8 b/x2goserver/man/man8/x2gocleansessions.8 index 6a51c6e..9867443 100644 --- a/x2goserver/man/man8/x2gocleansessions.8 +++ b/x2goserver/man/man8/x2gocleansessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocleansessions 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2gocleansessions 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2gocleansessions \- X2Go Server Cleanup Daemon .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gocmdexitmessage.8 b/x2goserver/man/man8/x2gocmdexitmessage.8 index b2f2418..4fcca1b 100644 --- a/x2goserver/man/man8/x2gocmdexitmessage.8 +++ b/x2goserver/man/man8/x2gocmdexitmessage.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocmdexitmessage 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2gocmdexitmessage 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2gocmdexitmessage \- Exit Message of X2Go Command .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2godbadmin.8 b/x2goserver/man/man8/x2godbadmin.8 index 81b1379..b0ffe5b 100644 --- a/x2goserver/man/man8/x2godbadmin.8 +++ b/x2goserver/man/man8/x2godbadmin.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2godbadmin 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Admin Tool" +.TH x2godbadmin 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Admin Tool" .SH NAME x2godbadmin \- X2Go Server Database Administrator .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gofeature.8 b/x2goserver/man/man8/x2gofeature.8 index c350e0d..9f28abe 100644 --- a/x2goserver/man/man8/x2gofeature.8 +++ b/x2goserver/man/man8/x2gofeature.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofeature 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2gofeature 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2gofeature \- Query X2Go Feature Availability on X2Go Server .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gofeaturelist.8 b/x2goserver/man/man8/x2gofeaturelist.8 index aa5c03e..73586d7 100644 --- a/x2goserver/man/man8/x2gofeaturelist.8 +++ b/x2goserver/man/man8/x2gofeaturelist.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofeaturelist 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2gofeaturelist 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2gofeaturelist \- Query X2Go Feature List for X2Go Server .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gogetservers.8 b/x2goserver/man/man8/x2gogetservers.8 index ac6ff22..b1caaf2 100644 --- a/x2goserver/man/man8/x2gogetservers.8 +++ b/x2goserver/man/man8/x2gogetservers.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gogetservers 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2gogetservers 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2gogetservers \- Retrieve list of available X2Go servers .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistdesktops.8 b/x2goserver/man/man8/x2golistdesktops.8 index 734c682..0b9eba2 100644 --- a/x2goserver/man/man8/x2golistdesktops.8 +++ b/x2goserver/man/man8/x2golistdesktops.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistdesktops 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2golistdesktops 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2golistdesktops \- List Available X Desktops .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8 index 79a2966..a17100e 100644 --- a/x2goserver/man/man8/x2golistmounts.8 +++ b/x2goserver/man/man8/x2golistmounts.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistmounts 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2golistmounts 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2golistmounts \- List Mounted Shares for an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8 index bd6bc0e..0fdee1f 100644 --- a/x2goserver/man/man8/x2golistsessions.8 +++ b/x2goserver/man/man8/x2golistsessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2golistsessions 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2golistsessions \- List Available X2Go Sessions for User .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistsessions_root.8 b/x2goserver/man/man8/x2golistsessions_root.8 index c3b3a34..94482f4 100644 --- a/x2goserver/man/man8/x2golistsessions_root.8 +++ b/x2goserver/man/man8/x2golistsessions_root.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions_root 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Admin Tool" +.TH x2golistsessions_root 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Admin Tool" .SH NAME x2golistsessions_root \- List X2Go Sessions for System .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gomountdirs.8 b/x2goserver/man/man8/x2gomountdirs.8 index 6361560..1568e40 100644 --- a/x2goserver/man/man8/x2gomountdirs.8 +++ b/x2goserver/man/man8/x2gomountdirs.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gomountdirs 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2gomountdirs 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2gomountdirs \- Share Client-Side Folder with X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gopath.8 b/x2goserver/man/man8/x2gopath.8 index 123a183..1a00c7b 100644 --- a/x2goserver/man/man8/x2gopath.8 +++ b/x2goserver/man/man8/x2gopath.8 @@ -1,4 +1,4 @@ -.TH x2gopath 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2gopath 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH Name .PP x2gopath - Show X2Go Server installation paths diff --git a/x2goserver/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8 index fc4ac6a..34062fb 100644 --- a/x2goserver/man/man8/x2goresume-session.8 +++ b/x2goserver/man/man8/x2goresume-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goresume-session 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2goresume-session 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2goresume-session \- Resume X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8 index a20f161..9fce592 100644 --- a/x2goserver/man/man8/x2goruncommand.8 +++ b/x2goserver/man/man8/x2goruncommand.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goruncommand 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2goruncommand 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2goruncommand \- Launch Command inside an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosessionlimit.8 b/x2goserver/man/man8/x2gosessionlimit.8 index e09d3e4..4ed20ed 100644 --- a/x2goserver/man/man8/x2gosessionlimit.8 +++ b/x2goserver/man/man8/x2gosessionlimit.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosessionlimit 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2gosessionlimit 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2gosessionlimit \- Detect Session Limit for User or Group .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosetkeyboard.8 b/x2goserver/man/man8/x2gosetkeyboard.8 index 958790e..70c1cff 100644 --- a/x2goserver/man/man8/x2gosetkeyboard.8 +++ b/x2goserver/man/man8/x2gosetkeyboard.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosetkeyboard 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool (PyHoca)" +.TH x2gosetkeyboard 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool (PyHoca)" .SH NAME x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2Go Client .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goshowblocks.8 b/x2goserver/man/man8/x2goshowblocks.8 index 9533a06..06c281d 100644 --- a/x2goserver/man/man8/x2goshowblocks.8 +++ b/x2goserver/man/man8/x2goshowblocks.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goshowblocks 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2goshowblocks 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2goshowblocks \- Show X2Go-Mounted Block Devices .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8 index ccf3254..9c51eff 100644 --- a/x2goserver/man/man8/x2gostartagent.8 +++ b/x2goserver/man/man8/x2gostartagent.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gostartagent 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2gostartagent 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2gostartagent \- Start a New X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosuspend-session.8 b/x2goserver/man/man8/x2gosuspend-session.8 index f196536..cd96906 100644 --- a/x2goserver/man/man8/x2gosuspend-session.8 +++ b/x2goserver/man/man8/x2gosuspend-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-session 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2gosuspend-session 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2gosuspend-session \- Suspend an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goterminate-session.8 b/x2goserver/man/man8/x2goterminate-session.8 index ad9af36..5f95843 100644 --- a/x2goserver/man/man8/x2goterminate-session.8 +++ b/x2goserver/man/man8/x2goterminate-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate-session 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2goterminate-session 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2goterminate-session \- Terminate an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8 index 84da1bd..183bcaf 100644 --- a/x2goserver/man/man8/x2goumount-session.8 +++ b/x2goserver/man/man8/x2goumount-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goumount-session 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2goumount-session 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2goumount-session \- Unshare mounted Folders from X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goversion.8 b/x2goserver/man/man8/x2goversion.8 index 4c0631a..b7a656b 100644 --- a/x2goserver/man/man8/x2goversion.8 +++ b/x2goserver/man/man8/x2goversion.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goversion 8 "Okt 2014" "Version 4.0.1.17" "X2Go Server Tool" +.TH x2goversion 8 "Okt 2014" "Version 4.0.1.18" "X2Go Server Tool" .SH NAME x2goversion \- Retrieve Code Versions of X2Go Server Components .SH SYNOPSIS -- 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 0174a5202742636f020f01df0c9c04f95980bdbb Author: Horst Schirmeier <horst@schirmeier.com> Date: Mon Oct 6 22:17:25 2014 +0200 Remove stale X11 lock files in cases where x2goagent mysteriously disappeared (e.g., due to kill -9 or a crash). (Fixes: #630). --- debian/changelog | 5 ++++- x2goserver/sbin/x2gocleansessions | 12 +++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 64683f4..3504855 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ x2goserver (4.0.1.18-0x2go1) UNRELEASED; urgency=medium - * Continue development... + [ Horst Schirmeier ] + * New upstream release (4.0.1.18): + - Remove stale X11 lock files in cases where x2goagent mysteriously + disappeared (e.g., due to kill -9 or a crash). (Fixes: #630). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 06 Oct 2014 22:13:22 +0200 diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 59afe91..e576e60 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -206,6 +206,11 @@ elsif ($pid == 0 ) syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 socket file: /tmp/.X11-unix/X$display"); unlink("/tmp/.X11-unix/X$display"); } + if (-e "/tmp/.X$display-lock") { + # remove the NX-X11 lock file (as the agent will not have managed after a kill -9) + syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 lock file: /tmp/.X$display-lock"); + unlink("/tmp/.X$display-lock"); + } syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su", "@sinfo[11]", "-c", "export HOSTNAME && x2goumount-session @sinfo[1]"); } @@ -219,7 +224,12 @@ elsif ($pid == 0 ) syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 socket file: /tmp/.X11-unix/X$display"); unlink("/tmp/.X11-unix/X$display"); } - syslog('debug', "@sinfo[1], pid @sinfo[0] does not exist, changing status from @sinfo[4] to F"); + if (-e "/tmp/.X$display-lock") { + # remove the NX-X11 lock file (we don't know how the agent disappeared, + # someone might have shot it with kill -9) + syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 lock file: /tmp/.X$display-lock"); + unlink("/tmp/.X$display-lock"); + } 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]"); } -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org