From 20c1977d58bb51a1e5c6bea892ab5a422358d5ff Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 25 Feb 2014 14:12:09 -0500
Subject: redhat: fixed killproc behavior when multiprocessing core doesn't
 shut down properly

---
 redhat/scripts/bcfg2-server.init | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'redhat')

diff --git a/redhat/scripts/bcfg2-server.init b/redhat/scripts/bcfg2-server.init
index f74a856eb..7fd1bd906 100755
--- a/redhat/scripts/bcfg2-server.init
+++ b/redhat/scripts/bcfg2-server.init
@@ -49,7 +49,13 @@ start () {
 
 stop () {
     echo -n $"Stopping $prog: "
-    killproc -p ${PIDFILE} -d 30 ${prog} && success || failure
+    # we do NOT want to specify the pidfile to killproc; if we do, and
+    # it has to kill -9 the server, it only kills the master and the
+    # child processes stay running (if the multiprocessing core is in
+    # use).  By not specifying a pidfile, it looks in the process
+    # table for all bcfg2-server processes, and kill -9's them all if
+    # necessary.
+    killproc -d 30 ${prog} && success || failure
     RETVAL=$?
     echo
     rm -f /var/lock/subsys/$prog
-- 
cgit v1.2.3-1-g7c22