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

SVN-Revision: 1865

diff --git a/openwrt/package/dnsmasq/files/S50dnsmasq b/openwrt/package/dnsmasq/files/S50dnsmasq
index 4f3721846b29259555ad79e84e2c2ec331ba34eb..c97096054d853fac241f4f8747f8274d785cce71 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}))
   
-  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}

diff --git a/openwrt/package/dnsmasq/files/dnsmasq.conf b/openwrt/package/dnsmasq/files/dnsmasq.conf
index 4ef96803a6c74c6138cff13d93d25a02333f6f6e..c770d53ddeee0590b9571a6c53ad3b589a1660fd 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
 
-# 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