- test suite fixes

[packages/glibc.git] / nscd.init

diff --git a/nscd.init b/nscd.init
index 75725ef886f239282dd9b7ecad72af2478636652..500ebfb90930947037395fc93d9004cad281a6fc 100644 (file)
--- a/nscd.init
+++ b/nscd.init
@@ -13,7 +13,6 @@
 
 # Sanity checks.
 [ -f /etc/nscd.conf ] || exit 0
-[ -x /usr/sbin/nscd ] || exit 0
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -24,7 +23,7 @@
 start() {
        if [ ! -f /var/lock/subsys/nscd ]; then
                msg_starting "Name Switch Cache Daemon"
-               daemon nscd
+               daemon /usr/sbin/nscd
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
        else
@@ -54,6 +53,15 @@ 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
@@ -74,7 +82,7 @@ case "$1" in
        condrestart 7
        ;;
   reload)
-       if [ -f /var/lock/subsys/nscd ]; then
+       if is_service_up nscd; then
                for db in passwd group hosts; do
                        show "Invalidating %s cache" $db; busy
                        nscd -i $db && ok || fail