- better messages in pre, added Requires(), release 8

[packages/bind.git] / named.init

diff --git a/named.init b/named.init
index 0bd639d46c284f85175af156716a8904ed2fd771..fb0e4520b3efc8af5298b3b2529199aad27dc0c2 100644 (file)
--- a/named.init
+++ b/named.init
@@ -3,30 +3,28 @@
 # named                This shell script takes care of starting and stopping
 #              named (BIND DNS server).
 #
-# chkconfig:   345 55 45
+# chkconfig:   345 14 89
+#
 # description: named (BIND) is a Domain Name Server (DNS) \
 #              that is used to resolve host names to IP addresses.
 
-# Source function library.
+# Source function library
 . /etc/rc.d/init.d/functions
 
-# Source networking configuration.
+# Source networking configuration
 . /etc/sysconfig/network
 
 # Try get config..
-if [ -f /etc/sysconfig/named ]; then
-     . /etc/sysconfig/named
-fi     
+[ -f /etc/sysconfig/named ] && . /etc/sysconfig/named
        
 # Check that networking is up.
 if is_no "${NETWORKING}"; then
-        # nls "ERROR: Networking is down. %s can't be run." <service>
-        msg_Network_Down "Named"
+        msg_network_down "Named"
        exit 1
 fi
                        
 # Sanity check
-[ -f /etc/named.conf ] || exit 0
+[ -e /etc/named.conf ] || exit 0
 
 # See how we were called.
 case "$1" in
@@ -34,16 +32,16 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/named ]; then
                msg_starting "Named"
-               touch /var/log/named && chown named.named /var/log/named
-               daemon named -u named -g named && chown named.named \
-                                               /var/run/named.pid
+               touch /var/lib/named/named.log && \
+                       chown named.named /var/lib/named/named.log
+               daemon named -u named -t /var/lib/named \
+                       -c /etc/named.conf -n ${NUM_CPUS:-1} </dev/null
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/named
        else
-               msg_Already_Running "Named"
+               msg_already_running "Named"
                exit 1
        fi
-
         ;;
   stop)
         if [ -f /var/lock/subsys/named ]; then
@@ -51,21 +49,27 @@ case "$1" in
                killproc named
                rm -f /var/lock/subsys/named >/dev/null 2>&1
         else
-               msg_Not_Running "Named"
+               msg_not_running "Named"
                 exit 1
         fi
-                                                                                                                       
-        ;;
+       ;;
   status)
-       /usr/sbin/ndc status
-       exit $?
+       status named
+       if [ -f /etc/rndc.conf ] ; then
+               /usr/sbin/rndc status
+               RETVAL=$?
+       fi
        ;;
   reload)
         if [ -f /var/lock/subsys/named ]; then
-               msg_reload "Named"
-               killproc named -HUP
+               if [ -f /etc/rndc.conf ] ; then
+                       run_cmd "Reloading named" /usr/sbin/rndc reload
+               else
+                       msg_reloading "Named"
+                       killproc named -HUP
+               fi
        else
-               msg_Not_Running "Named"
+               msg_not_running "Named"
                exit 1
        fi
                                                                                                                                                                                        
@@ -75,7 +79,7 @@ case "$1" in
        $0 start
        ;;
   *)
-        msg_Usage "$0 {start|stop|status|reload|restart}"
+        msg_usage "$0 {start|stop|status|reload|restart}"
         exit 1
 esac