From: Steven Barth <cyrus@openwrt.org>
Date: Sun, 23 Dec 2012 18:22:48 +0000 (+0000)
Subject: ipv6-support: Fix default RA settings for dnsmasq
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=970adc9eb9b1bf93c9e34ab6533f6e16f8d29967;p=openwrt%2Fstaging%2Fthess.git

ipv6-support: Fix default RA settings for dnsmasq

SVN-Revision: 34873
---

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