Partial 2.34 update.

[packages/glibc.git] / nscd.init

diff --git a/nscd.init b/nscd.init
index 500ebfb90930947037395fc93d9004cad281a6fc..0b478d501088a34153eee64efa37ecf0c00e047c 100644 (file)
--- a/nscd.init
+++ b/nscd.init
@@ -34,10 +34,8 @@ start() {
 stop() {
        if [ -f /var/lock/subsys/nscd ]; then
                msg_stopping "Name Switch Cache Daemon"
-               busy
-               /usr/sbin/nscd -K
+               killproc --pidfile /var/run/nscd/nscd.pid nscd -TERM
                rm -f /var/lock/subsys/nscd >/dev/null 2>&1
-               ok
        else
                msg_not_running "Name Switch Cache Daemon"
        fi
@@ -53,15 +51,6 @@ condrestart() {
        fi
 }
 
-upstart_controlled --except reload
-
-# return true if service is considered "up"
-# with upstart, upstart is consulted
-# otherwise lockfile in subsys must exist
-is_service_up() {
-       use_upstart && is_upstart_running "$1" || [ -f /var/lock/subsys/"$1" ]
-}
-
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -82,7 +71,7 @@ case "$1" in
        condrestart 7
        ;;
   reload)
-       if is_service_up nscd; then
+       if [ -f /var/lock/subsys/nscd ]; then
                for db in passwd group hosts; do
                        show "Invalidating %s cache" $db; busy
                        nscd -i $db && ok || fail