aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2013-01-23 08:15:09 +0000
committerSteven Barth <cyrus@openwrt.org>2013-01-23 08:15:09 +0000
commita81c76617ed1fb52455a160e82f13c795ad909ad (patch)
tree8ae63c3bf731cc21a321a4f80c05f2952f8f7f94
parent231f8c296989d501d400abd9ba7eb27f512121cd (diff)
downloadupstream-a81c76617ed1fb52455a160e82f13c795ad909ad.tar.gz
upstream-a81c76617ed1fb52455a160e82f13c795ad909ad.tar.bz2
upstream-a81c76617ed1fb52455a160e82f13c795ad909ad.zip
ipv6-support: don't overwrite existing setting across reflashs
SVN-Revision: 35302
-rw-r--r--package/network/ipv6/ipv6-support/Makefile2
-rw-r--r--package/network/ipv6/ipv6-support/files/network-enable-ipv6.defaults3
2 files changed, 4 insertions, 1 deletions
diff --git a/package/network/ipv6/ipv6-support/Makefile b/package/network/ipv6/ipv6-support/Makefile
index ef1f2a77c3..5ad52f8254 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:=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 c77914b530..3da74b1644 100644
--- 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