summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-12-23 18:22:48 +0000
committercyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-12-23 18:22:48 +0000
commit40ccb5f49bfd6520f9e3ecb865706aec7eb2ce70 (patch)
treefe4d2fa6fc1f89d9f814456cb28033ebf20b0035
parent3a230cdbcc6bd7afc6e62670044a3a7e8ecf1835 (diff)
ipv6-support: Fix default RA settings for dnsmasq
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34873 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/network/ipv6/ipv6-support/Makefile2
-rw-r--r--package/network/ipv6/ipv6-support/files/support.sh6
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