large init script cleanup and merge of whiterussian changes, new dnsmasq config handling

[openwrt/svn-archive/archive.git] / openwrt / package / dnsmasq / files / dnsmasq.conf

diff --git a/openwrt/package/dnsmasq/files/dnsmasq.conf b/openwrt/package/dnsmasq/files/dnsmasq.conf
index d4a9f082ca4635a25d9c4122a7956e72fea615a6..7aed3a3da4b62fb7891c4b76aea5c3b9f711fbb3 100644 (file)
--- a/openwrt/package/dnsmasq/files/dnsmasq.conf
+++ b/openwrt/package/dnsmasq/files/dnsmasq.conf
@@ -9,9 +9,15 @@ local=/lan/
 domain=lan
 expand-hosts
 
+@ifdef dhcp_enable
+dhcp-range=@@start@@,@@end@@,@@netmask@@,@@lease@@
+@endif
+@ifdef wan_ifname
+except-interface=@@wan_ifname@@
+@endif
+
 # enable dhcp (start,end,netmask,leasetime)
 dhcp-authoritative
-#dhcp-range=192.168.1.100,192.168.1.250,255.255.255.0,12h
 dhcp-leasefile=/tmp/dhcp.leases
 
 # use /etc/ethers for static hosts; same format as --dhcp-host