From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 7 Sep 2005 11:34:05 +0000 (+0000)
Subject: set dnsmasq except-interface in init script to wan_ifname instead of vlan1
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9740c2942b5347bce2f23415c2642685a06913ef;p=openwrt%2Fstaging%2Frobimarko.git

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

SVN-Revision: 1866
---

diff --git a/openwrt/package/dnsmasq/files/S50dnsmasq b/openwrt/package/dnsmasq/files/S50dnsmasq
index 4f3721846b..c97096054d 100755
--- 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 4ef96803a6..c770d53dde 100644
--- 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