- autodetection by default

Changed files:
    named.init -> 1.34
    named.sysconfig -> 1.3

diff --git a/named.init b/named.init
index 4d4d754547f6b088a097aae46d4b15af5e456525..ec0414d33cb9769198ca7c84728b0e14de822bb5 100644 (file)
--- a/named.init
+++ b/named.init
@@ -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,6 +34,8 @@ 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
@@ -40,7 +44,7 @@ start() {
                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
+                       -c /etc/named.conf $NAMED_OPT </dev/null
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/named
        else

diff --git a/named.sysconfig b/named.sysconfig
index dab54fbfc420237f8422c5f91e8e1147c2e61ec7..84e97a703182dd1f60706d15f43bda21ef8250e3 100644 (file)
--- a/named.sysconfig
+++ b/named.sysconfig
@@ -1,5 +1,6 @@
 # Set nice level for named
 SERVICE_RUN_NICE_LEVEL="+2"
 
-# Take advantage of SMP (default use 1 CPU)
-NUM_CPUS=1
+# Take advantage of SMP. If not set then named autodetects number of online CPUs
+# and runs that number of workers. You can force other value here.
+#NUM_CPUS=1