- use %service, adapterized

[packages/pdnsd.git] / pdnsd.init

diff --git a/pdnsd.init b/pdnsd.init
index 4cb2592af3512e188a8db7a9f1d12fc653aecd9f..b1c55844fec6b3df90ad44bbc40b9a4b625b6111 100644 (file)
--- a/pdnsd.init
+++ b/pdnsd.init
@@ -23,7 +23,7 @@ VERBOSE="-v2"
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                msg_network_down Pdnsd
                exit 1
        fi
@@ -33,57 +33,51 @@ fi
 
 test -x /usr/sbin/pdnsd || exit 0
 
-
+RETVAL=0
 case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/pdns ]; then
                msg_starting Pdns
-               daemon pdnsd --daemon $STATUS $DEBUG $VERBOSE
+               daemon pdnsd --daemon -p /var/run/pdnsd.pid $STATUS $DEBUG $VERBOSE
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pdns
        else
                msg_already_running Pdns
-               exit 1
        fi
        ;;
   stop)
        if [ -f /var/lock/subsys/pdns ]; then
                # Stop daemons.
-               # show "Stopping %s service" pdns
                msg_stopping Pdns
                killproc pdnsd
                rm -f /var/lock/subsys/pdns >/dev/null 2>&1
        else
                msg_not_running Pdns
-               exit 1
        fi
        ;;
   restart)
        $0 stop
        $0 start
+       exit $?
        ;;
-  reload)
+  reload|force-reload)
        if [ -f /var/lock/subsys/pdns ]; then
                msg_reloading Pdns
                killproc pdnsd -HUP
+               RETVAL=$?
        else
-               msg_not_running Pdns
-               exit 1
+               msg_not_running Pdns >&2
+               exit 7
        fi
        ;;
-  force-reload)
-       $0 reload
-       exit $?
-       ;;
   status)
        status pdnsd
        exit $?
        ;;
   *)
-       # show "Usage: %s {start|stop|restart|reload|force-reload|status}"
        msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
-       exit 1
+       exit 3
 esac
 
 exit $RETVAL