From: Mike Baker <mbm@openwrt.org>
Date: Tue, 8 Aug 2006 20:15:09 +0000 (+0000)
Subject: fix error if dhcp is disabled
X-Git-Tag: v12.09~18314^2~305
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=9d5733595ebd18d13fe881bac871bbc5c7b08c34;p=openwrt-github%2F.git

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 43acd85b15..8a51f8445d 100644
--- 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@@
+dhcp-authoritative
+dhcp-leasefile=/tmp/dhcp.leases
 @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