diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2005-09-07 11:34:05 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2005-09-07 11:34:05 +0000 |
| commit | c938c657ef36a8a8a1a97574f905b5b1ae2bc39d (patch) | |
| tree | fba813a87c953cef66828a11fcf38762b8d2f6bd | |
| parent | c46294e0ea587286e00275970b7db406a5128cd3 (diff) | |
| download | upstream-c938c657ef36a8a8a1a97574f905b5b1ae2bc39d.tar.gz upstream-c938c657ef36a8a8a1a97574f905b5b1ae2bc39d.tar.bz2 upstream-c938c657ef36a8a8a1a97574f905b5b1ae2bc39d.zip | |
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
| -rwxr-xr-x | openwrt/package/dnsmasq/files/S50dnsmasq | 5 | ||||
| -rw-r--r-- | openwrt/package/dnsmasq/files/dnsmasq.conf | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/openwrt/package/dnsmasq/files/S50dnsmasq b/openwrt/package/dnsmasq/files/S50dnsmasq index 4f3721846b2..c97096054d8 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 4ef96803a6c..c770d53ddee 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 |