summaryrefslogtreecommitdiffstats
path: root/redhat/scripts/bcfg2-server.init
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/scripts/bcfg2-server.init')
-rwxr-xr-xredhat/scripts/bcfg2-server.init10
1 files changed, 8 insertions, 2 deletions
diff --git a/redhat/scripts/bcfg2-server.init b/redhat/scripts/bcfg2-server.init
index c4412d1c3..f14938a16 100755
--- a/redhat/scripts/bcfg2-server.init
+++ b/redhat/scripts/bcfg2-server.init
@@ -27,7 +27,7 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin
test -f /etc/sysconfig/$prog && . /etc/sysconfig/$prog
if [ "$BCFG2_SERVER_ENABLED" -eq 0 ] ; then
- failure $"bcfg2-server is disabled - see /etc/sysconfig/bcfg2-server"
+ failure $"bcfg2-server is disabled - see /etc/sysconfig/$prog"
echo
exit 0
fi
@@ -49,7 +49,13 @@ start () {
stop () {
echo -n $"Stopping $prog: "
- killproc ${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