<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
Hi,<br>
<br>
sorry for that. Maybe I should you apply the patches in future. ;)<br>
<br>
Cheers<br>
Morty<br>
<br>
On 2012-01-30 18:48, Mike Gabriel wrote:
<blockquote
cite="mid:20120130184822.11004p9kz9dfnjza@mail.das-netzwerkteam.de"
type="cite">Hi Morty,
<br>
<br>
your commit is missing a changelog entry (/debian/changelog).
Please add that.
<br>
<br>
THANKS!
<br>
Mike
<br>
<br>
<br>
On Mo 30 Jan 2012 18:19:07 CET X2go dev team wrote:
<br>
<br>
<blockquote type="cite">The branch, master has been updated
<br>
via 322a7f990adab973aa4dd39d5a07688e6020f977 (commit)
<br>
from a591dd31b532c0fdc98cd051931ac4132ad7b40c (commit)
<br>
<br>
Those revisions listed above that are new to this repository
have
<br>
not appeared on any other notification email; so we list those
<br>
revisions in full, below.
<br>
<br>
- Log
-----------------------------------------------------------------
<br>
commit 322a7f990adab973aa4dd39d5a07688e6020f977
<br>
Author: Moritz 'Morty' Strübe <a class="moz-txt-link-rfc2396E" href="mailto:morty@gmx.net"><morty@gmx.net></a>
<br>
Date: Fri Dec 9 18:52:34 2011 +0100
<br>
<br>
Make sure the socket used by nxagent is not already in use
<br>
<br>
-----------------------------------------------------------------------
<br>
<br>
Summary of changes:
<br>
debian/control | 3 ++-
<br>
x2goserver/bin/x2gostartagent | 8 ++++++--
<br>
2 files changed, 8 insertions(+), 3 deletions(-)
<br>
<br>
The diff of changes is:
<br>
diff --git a/debian/control b/debian/control
<br>
index ff07d92..0a51bcd 100644
<br>
--- a/debian/control
<br>
+++ b/debian/control
<br>
@@ -27,7 +27,8 @@ Depends:
<br>
libdbd-sqlite3-perl,
<br>
adduser,
<br>
xauth,
<br>
- psmisc
<br>
+ psmisc,
<br>
+ net-tools
<br>
Recommends:
<br>
sshfs,
<br>
x11-apps,
<br>
diff --git a/x2goserver/bin/x2gostartagent
b/x2goserver/bin/x2gostartagent
<br>
index e882fdd..a4952bc 100755
<br>
--- a/x2goserver/bin/x2gostartagent
<br>
+++ b/x2goserver/bin/x2gostartagent
<br>
@@ -120,8 +120,12 @@
USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME`
<br>
while [ "$OUTPUT" != "inserted" ]; do
<br>
X2GO_PORT=$(($X2GO_PORT + 1))
<br>
X2GO_PORT=`echo "for(\$i=$X2GO_PORT;\$br ne "true";\$i++){
if("$USED_DISPLAYS" =~
m/\|\$i\|/){\$br="false";}else{\$br="true";print \$i;}}"|perl`
<br>
-
<br>
- if [ -e "/tmp/.X${X2GO_PORT}-lock" ] || [ -e
"/tmp/.X11-unix/X${X2GO_PORT}" ]; then
<br>
+
<br>
+ #Test if the session is already in use. nxagent uses
6000+DISPLAY to open a port. Therefore this must be tested, too.
<br>
+ NX_PORT=$(($X2GO_PORT + 6000))
<br>
+ if [ -e "/tmp/.X${X2GO_PORT}-lock" ] ||
<br>
+ [ -e "/tmp/.X11-unix/X${X2GO_PORT}" ] ||
<br>
+ netstat -ntl 2>/dev/null | grep -q ":${NX_PORT} ";
then
<br>
OUTPUT="XXX"
<br>
else
<br>
SESSION_NAME=${USER}-${X2GO_PORT}-`date +"%s"`
<br>
<br>
<br>
hooks/post-receive
<br>
--
<br>
x2goserver.git (X2Go Server)
<br>
<br>
This is an automated email from the git hooks/post-receive
script. It was
<br>
generated because a ref change was pushed to the repository
containing
<br>
the project "x2goserver.git" (X2Go Server).
<br>
<br>
_______________________________________________
<br>
X2go-commits mailing list
<br>
<a class="moz-txt-link-abbreviated" href="mailto:X2go-commits@lists.berlios.de">X2go-commits@lists.berlios.de</a>
<br>
<a class="moz-txt-link-freetext" href="https://lists.berlios.de/mailman/listinfo/x2go-commits">https://lists.berlios.de/mailman/listinfo/x2go-commits</a>
<br>
<br>
</blockquote>
<br>
<br>
<br>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
X2Go-Dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:X2Go-Dev@lists.berlios.de">X2Go-Dev@lists.berlios.de</a>
<a class="moz-txt-link-freetext" href="https://lists.berlios.de/mailman/listinfo/x2go-dev">https://lists.berlios.de/mailman/listinfo/x2go-dev</a>
</pre>
</blockquote>
<br>
<br>
<pre class="moz-signature" cols="72">--
Dipl.-Ing. Moritz 'Morty' Struebe (Wissenschaftlicher Mitarbeiter)
Lehrstuhl für Informatik 4 (Verteilte Systeme und Betriebssysteme)
Friedrich-Alexander-Universität Erlangen-Nürnberg
Martensstr. 1
91058 Erlangen
Tel : +49 9131 85-25419
Fax : +49 9131 85-28732
eMail : <a class="moz-txt-link-abbreviated" href="mailto:struebe@informatik.uni-erlangen.de">struebe@informatik.uni-erlangen.de</a>
WWW : <a class="moz-txt-link-freetext" href="http://www4.informatik.uni-erlangen.de/~morty">http://www4.informatik.uni-erlangen.de/~morty</a>
</pre>
</body>
</html>