summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-07 11:34:05 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-07 11:34:05 +0000
commit8d609d467ac1ccd3be4ee79b7e74148f87ded2f8 (patch)
tree699e7b154c719b913f2cc1af10fc4c55e2c297b9
parentcb753468257923266ca392c7aae28b4161eef976 (diff)
set dnsmasq except-interface in init script to wan_ifname instead of vlan1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1866 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/dnsmasq/files/S50dnsmasq5
-rw-r--r--package/dnsmasq/files/dnsmasq.conf3
2 files changed, 4 insertions, 4 deletions
diff --git a/package/dnsmasq/files/S50dnsmasq b/package/dnsmasq/files/S50dnsmasq
index 4f3721846b..c97096054d 100755
--- a/package/dnsmasq/files/S50dnsmasq
+++ b/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/package/dnsmasq/files/dnsmasq.conf b/package/dnsmasq/files/dnsmasq.conf
index 4ef96803a6..c770d53dde 100644
--- a/package/dnsmasq/files/dnsmasq.conf
+++ b/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