diff options
| author | Steven Barth <steven@midlink.org> | 2013-01-23 08:15:09 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2013-01-23 08:15:09 +0000 |
| commit | 1d9e351fff4e1c76eb31890568cec82510af9c7a (patch) | |
| tree | b828ad31eb53cb49821e4219fb40cbdec5fddf75 /package/network | |
| parent | 18b0769704e3f26ac081a0669499b0a1cda2c284 (diff) | |
| download | upstream-1d9e351fff4e1c76eb31890568cec82510af9c7a.tar.gz upstream-1d9e351fff4e1c76eb31890568cec82510af9c7a.tar.bz2 upstream-1d9e351fff4e1c76eb31890568cec82510af9c7a.zip | |
ipv6-support: don't overwrite existing setting across reflashs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35302 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network')
| -rw-r--r-- | package/network/ipv6/ipv6-support/Makefile | 2 | ||||
| -rw-r--r-- | package/network/ipv6/ipv6-support/files/network-enable-ipv6.defaults | 3 |
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 |