fix error if dhcp is disabled

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4545 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/dnsmasq/files/dnsmasq.conf b/package/dnsmasq/files/dnsmasq.conf
index 43acd85b154f9999c3b710759eadba622df9d412..8a51f8445d6d8786ca0fc2185b48740bb908467b 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.conf
+++ b/package/dnsmasq/files/dnsmasq.conf
@@ -12,15 +12,13 @@ resolv-file=/tmp/resolv.conf
 
 @ifdef dhcp_enable
 dhcp-range=@@start@@,@@end@@,@@netmask@@,@@lease@@
 
 @ifdef dhcp_enable
 dhcp-range=@@start@@,@@end@@,@@netmask@@,@@lease@@

+dhcp-authoritative
+dhcp-leasefile=/tmp/dhcp.leases

 @endif
 @ifdef wan_ifname
 except-interface=@@wan_ifname@@
 @endif
 
 @endif
 @ifdef wan_ifname
 except-interface=@@wan_ifname@@
 @endif
 

-# enable dhcp (start,end,netmask,leasetime)
-dhcp-authoritative
-dhcp-leasefile=/tmp/dhcp.leases
-

 # use /etc/ethers for static hosts; same format as --dhcp-host
 # <hwaddr> <ipaddr>
 read-ethers
 # use /etc/ethers for static hosts; same format as --dhcp-host
 # <hwaddr> <ipaddr>
 read-ethers