- up to 9.8.0 P4

[packages/bind.git] / named.init

diff --git a/named.init b/named.init
index 4d4d754547f6b088a097aae46d4b15af5e456525..d94131ebd679b2bd6517f1d01b65f673de555b45 100644 (file)
--- a/named.init
+++ b/named.init
@@ -3,7 +3,7 @@
 # named                This shell script takes care of starting and stopping
 #              named (BIND DNS server).
 #
-# chkconfig:   345 14 89
+# chkconfig:   345 11 89
 #
 # description: named (BIND) is a Domain Name Server (DNS) \
 #              that is used to resolve host names to IP addresses.
@@ -16,6 +16,8 @@ CHROOT_TO_DIR="/var/lib/named"
 # Source networking configuration
 . /etc/sysconfig/network
 
+NAMED_OPT=""
+
 # Try get config..
 [ -f /etc/sysconfig/named ] && . /etc/sysconfig/named
 
@@ -32,15 +34,18 @@ fi
 # Sanity check
 [ -e /etc/named.conf ] || exit 0
 
+[ -n "$NUM_CPUS" ] && NAMED_OPT="$NAMED_OPT -n $NUM_CPUS"
+
 start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/named ]; then
                msg_starting "Named"
-               [ -f /etc/localtime ] && cp -a /etc/localtime $CHROOT_TO_DIR/etc/localtime
+               modprobe -s capability > /dev/null 2>&1
+               [ -f /etc/localtime ] && cp -puL /etc/localtime $CHROOT_TO_DIR/etc/localtime
                touch $CHROOT_TO_DIR/named.log && \
                        chown named:named $CHROOT_TO_DIR/named.log
-               daemon named -u named -t $CHROOT_TO_DIR \
-                       -c /etc/named.conf -n ${NUM_CPUS:-1} </dev/null
+               daemon --pidfile $CHROOT_TO_DIR/named.pid /usr/sbin/named -u named \
+                       -t $CHROOT_TO_DIR -c /etc/named.conf $NAMED_OPT </dev/null
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/named
        else
@@ -51,7 +56,7 @@ start() {
 stop() {
        if [ -f /var/lock/subsys/named ]; then
                msg_stopping "Named"
-               killproc named
+               killproc --pidfile $CHROOT_TO_DIR/named.pid named
                rm -f /var/lock/subsys/named >/dev/null 2>&1
        else
                msg_not_running "Named"
@@ -62,10 +67,10 @@ RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-       start
+       start
        ;;
   stop)
-       stop
+       stop
        ;;
   status)
        status named