follow the stable tree, upgrade to 2.6.16.3

[openwrt.git] / openwrt / package / dnsmasq / files / dnsmasq.conf

diff --git a/openwrt/package/dnsmasq/files/dnsmasq.conf b/openwrt/package/dnsmasq/files/dnsmasq.conf
index 4ef9680..7aed3a3 100644 (file)
--- a/openwrt/package/dnsmasq/files/dnsmasq.conf
+++ b/openwrt/package/dnsmasq/files/dnsmasq.conf
@@ -7,17 +7,21 @@ localise-queries
 # allow /etc/hosts and dhcp lookups via *.lan
 local=/lan/
 domain=lan
+expand-hosts
 
-# no dhcp / dns queries from the wan
-except-interface=vlan1
+@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
+dhcp-leasefile=/tmp/dhcp.leases
 
 # use /etc/ethers for static hosts; same format as --dhcp-host
-# <hwaddr> [<hostname>] <ipaddr>
+# <hwaddr> <ipaddr>
 read-ethers
 
 # other useful options: