set dnsmasq except-interface in init script to wan_ifname instead of vlan1

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1866 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/dnsmasq/files/S50dnsmasq b/openwrt/package/dnsmasq/files/S50dnsmasq
index 4f37218..c970960 100755 (executable)
--- a/openwrt/package/dnsmasq/files/S50dnsmasq
+++ b/openwrt/package/dnsmasq/files/S50dnsmasq
@@ -20,6 +20,9 @@ udhcpc -n -q -R -s /bin/true -i $ifname >&- || {
   end=$(nvram get dhcp_num)
   end=$((start+${end:-150}))
   
   end=$(nvram get dhcp_num)
   end=$((start+${end:-150}))
   

-  args="-l /tmp/dhcp.leases -K -F $(int2ip $start),$(int2ip $end),$(int2ip $netmask),12h"
+  wanproto=$(nvram get wan_proto)
+  [ -z "$wanproto" -o "$wanproto" = "none" ] || wanif=$(nvram get wan_ifname)
+  
+  args="-l /tmp/dhcp.leases -K -F $(int2ip $start),$(int2ip $end),$(int2ip $netmask),12h ${wanif:+-I ${wanif} }"

 }
 dnsmasq ${args}
 }
 dnsmasq ${args}

diff --git a/openwrt/package/dnsmasq/files/dnsmasq.conf b/openwrt/package/dnsmasq/files/dnsmasq.conf
index 4ef9680..c770d53 100644 (file)
--- a/openwrt/package/dnsmasq/files/dnsmasq.conf
+++ b/openwrt/package/dnsmasq/files/dnsmasq.conf
@@ -8,9 +8,6 @@ localise-queries
 local=/lan/
 domain=lan
 
 local=/lan/
 domain=lan
 

-# no dhcp / dns queries from the wan
-except-interface=vlan1
-

 # enable dhcp (start,end,netmask,leasetime)
 dhcp-authoritative
 #dhcp-range=192.168.1.100,192.168.1.250,255.255.255.0,12h
 # enable dhcp (start,end,netmask,leasetime)
 dhcp-authoritative
 #dhcp-range=192.168.1.100,192.168.1.250,255.255.255.0,12h