[X2Go-Commits] [x2gobroker] 01/01: Fix detection of running x2gobroker-daemon process in Debian's SystemV init script.
git-admin at x2go.org
git-admin at x2go.org
Mon Mar 30 14:15:11 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit 1efc25063884d26bb2e12d1fd31aa992a8a50af6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Mar 30 14:15:06 2015 +0200
Fix detection of running x2gobroker-daemon process in Debian's SystemV init script.
---
debian/changelog | 2 ++
init/x2gobroker-daemon.init | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 9ef478a..91f6f59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -269,6 +269,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
- Adapt tests to new load checker service feature.
- Only check for 'load_factors' key in remote_agent dict, if agent query mode
is SSH.
+ - Fix detection of running x2gobroker-daemon process in Debian's SystemV
+ init script.
* debian/control:
+ Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
+ Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init
index 5639484..9e39fd0 100755
--- a/init/x2gobroker-daemon.init
+++ b/init/x2gobroker-daemon.init
@@ -82,7 +82,7 @@ is_true()
case "${1:-}" in
start)
if [ -f $PIDFILE_BROKER ]; then
- if ps a -u $X2GOBROKER_DAEMON_USER | egrep -v "(grep|ps)" | grep "$(basename $DAEMON)" 1>/dev/null 2>/dev/null; then
+ if ps a -u $X2GOBROKER_DAEMON_USER | egrep -v "(grep|ps)" | awk '{ print $5 }' | grep "$(basename $DAEMON)" 1>/dev/null 2>/dev/null; then
log_warning_msg "X2Go Session Broker already running"
else
log_warning_msg "X2Go Session Broker: stale PID file ($PIDFILE_BROKER). Delete it manually!"
--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
More information about the x2go-commits
mailing list