ipv6-support: don't overwrite existing setting across reflashs

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35302 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/network/ipv6/ipv6-support/Makefile b/package/network/ipv6/ipv6-support/Makefile
index ef1f2a7..5ad52f8 100644 (file)
--- 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:=2013-01-18
+PKG_VERSION:=2013-01-23
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/package/network/ipv6/ipv6-support/files/network-enable-ipv6.defaults b/package/network/ipv6/ipv6-support/files/network-enable-ipv6.defaults
index c77914b..3da74b1 100644 (file)
--- a/package/network/ipv6/ipv6-support/files/network-enable-ipv6.defaults
+++ b/package/network/ipv6/ipv6-support/files/network-enable-ipv6.defaults
@@ -1,4 +1,7 @@
 #!/bin/sh
+# Don't override existing settings
+uci get network.globals && exit 0
+
 uci -q batch <<-EOF >/dev/null
        set network.globals=globals
        set network.globals.ula_prefix=auto