[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-151-g4b98c6c

[X2Go dev team]

The branch, master has been updated
       via  4b98c6c1e3761c95afbb49ef9f3ba2004407cc45 (commit)
      from  2edbb54fdec01f43f2e4a140f2e7bffb1d4b5fb6 (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 4b98c6c1e3761c95afbb49ef9f3ba2004407cc45
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 27 14:18:37 2013 +0100

    Be more precise in Debian et al. init scripts when checking if the service is already running.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                 |    2 ++
 init/x2gobroker-authservice.init |    2 +-
 init/x2gobroker-daemon.init      |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fafff87..538f550 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     - Let x2gobroker-authservice take care of tidying up its own socket file.
     - Provide PAM config file for Debian and RHEL separately (as they differ).
     - Makefile: Clean up x2gobroker-agent binary.
+    - Be more precise in Debian et al. init scripts when checking if the service
+      is already running.
   * debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
     + Fix SYNOPSIS texts.
diff --git a/init/x2gobroker-authservice.init b/init/x2gobroker-authservice.init
index f34f5a0..5f5e24a 100755
--- a/init/x2gobroker-authservice.init
+++ b/init/x2gobroker-authservice.init
@@ -64,7 +64,7 @@ is_true()
 case "${1:-}" in
 	start)
 		if [ -f $PIDFILE_AUTHSERVICE ]; then
-			if ps a -u root | grep $(basename $AUTHSERVICE) 1>/dev/null 2>/dev/null; then
+			if ps a -u root | grep -v egrep | egrep ".*$(basename $AUTHSERVICE).*$X2GOBROKER_AUTHSERVICE_SOCKET.*" 1>/dev/null 2>/dev/null; then
 				log_warning_msg "X2Go Broker Authentication Service already running"
 			else
 				log_warning_msg "X2Go Broker Authentication Service: stale PID file ($PIDFILE_AUTHSERVICE). Delete it manually!"
diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init
index 444673b..4a23b4e 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 | grep $(basename $DAEMON) 1>/dev/null 2>/dev/null; then
+			if ps a -u $X2GOBROKER_DAEMON_USER | grep -v grep | 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!"


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).