diff options
| author | Steven Barth <cyrus@openwrt.org> | 2012-12-23 18:22:48 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2012-12-23 18:22:48 +0000 |
| commit | 970adc9eb9b1bf93c9e34ab6533f6e16f8d29967 (patch) | |
| tree | ff025aa6d1426583108975b2cb2f43577f4b0102 | |
| parent | a1e2b2ebe859b817e412438a6f6bccc3afccaba7 (diff) | |
| download | upstream-970adc9eb9b1bf93c9e34ab6533f6e16f8d29967.tar.gz upstream-970adc9eb9b1bf93c9e34ab6533f6e16f8d29967.tar.bz2 upstream-970adc9eb9b1bf93c9e34ab6533f6e16f8d29967.zip | |
ipv6-support: Fix default RA settings for dnsmasq
SVN-Revision: 34873
| -rw-r--r-- | package/network/ipv6/ipv6-support/Makefile | 2 | ||||
| -rw-r--r-- | package/network/ipv6/ipv6-support/files/support.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package/network/ipv6/ipv6-support/Makefile b/package/network/ipv6/ipv6-support/Makefile index 6bc3f79b39..76c97c2098 100644 --- a/package/network/ipv6/ipv6-support/Makefile +++ b/package/network/ipv6/ipv6-support/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ipv6-support -PKG_VERSION:=2012-12-22 +PKG_VERSION:=2012-12-23 PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/network/ipv6/ipv6-support/files/support.sh b/package/network/ipv6/ipv6-support/files/support.sh index 8cd044f990..261ff1e8b3 100644 --- a/package/network/ipv6/ipv6-support/files/support.sh +++ b/package/network/ipv6/ipv6-support/files/support.sh @@ -438,12 +438,12 @@ enable_router() { if [ "$router_service" == "dnsmasq" ]; then local dnsmasq_opts - config_get dnsmasq_opts global dnsmasq_opts - [ -z "$dnsmasq_opts" ] && dnsmasq_opts="ra-stateful,ra-names" + config_get dnsmasq_opts "$network" dnsmasq_opts + [ -z "$dnsmasq_opts" ] && dnsmasq_opts="ra-names,24h" local conf="/var/etc/dnsmasq.d/ipv6-router-$network.conf" mkdir -p $(dirname $conf) - echo "dhcp-range=::1,constructor:$device,$dnsmasq_opts" > $conf + echo "dhcp-range=::00ff,::ffff,constructor:$device,$dnsmasq_opts" > $conf echo "enable-ra" >> $conf /etc/init.d/dnsmasq restart else |