From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 7 May 2007 16:27:44 +0000 (+0000)
Subject: Use an init script that will start named, not dhcpd (#1627)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=a28c7d7f491248f9188c792d25f5aaf866782f0c

Use an init script that will start named, not dhcpd (#1627)


SVN-Revision: 7125
---

diff --git a/net/bind/files/named.init b/net/bind/files/named.init
index c4b9a7d53f..459e0834ae 100755
--- a/net/bind/files/named.init
+++ b/net/bind/files/named.init
@@ -1,27 +1,21 @@
 #!/bin/sh /etc/rc.common
 
-lease_file=/tmp/dhcpd.leases
-config_file=/etc/dhcpd.conf
-pid_file=/var/run/dhcpd.pid
+config_file=/etc/bind/named.conf
+pid_file=/var/run/named.pid
 
 start() {
-  echo Starting isc-dhcpd
+  echo Starting isc-bind
 
-  if [ ! -e $lease_file ]; then
-    echo "  Creating $lease_file"
-    touch $lease_file
-  fi
-
-  /usr/sbin/dhcpd -cf $config_file -lf $lease_file
+  /usr/sbin/named -c $config_file
 
   if [ $$ -eq 0 ]
   then
-    echo "  isc-dhcpd failed to start"
+    echo "  isc-bind failed to start"
   fi
 }
 
 stop() {
-  echo "Stopping isc-dhcpd"
+  echo "Stopping isc-bind"
   if [ -e $pid_file ]
   then
     kill `cat $pid_file`
@@ -29,7 +23,7 @@ stop() {
     if [ $$ -eq 0 ]
     then
       echo "  PID " `cat $pid_file` not found
-      echo "  Is the DHCP server running?"
+      echo "  Is the named server running?"
     fi
 
     rm $pid_file