summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-02-25 14:12:09 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2014-02-25 14:12:09 -0500
commit20c1977d58bb51a1e5c6bea892ab5a422358d5ff (patch)
tree8f041858327d65b922a4119246c2073e6d7a1feb /redhat
parent7f93c994854fb6876a4008baf172cdb432eed612 (diff)
downloadbcfg2-20c1977d58bb51a1e5c6bea892ab5a422358d5ff.tar.gz
bcfg2-20c1977d58bb51a1e5c6bea892ab5a422358d5ff.tar.bz2
bcfg2-20c1977d58bb51a1e5c6bea892ab5a422358d5ff.zip
redhat: fixed killproc behavior when multiprocessing core doesn't shut down properly
Diffstat (limited to 'redhat')
-rwxr-xr-xredhat/scripts/bcfg2-server.init8
1 files changed, 7 insertions, 1 deletions
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