diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-09-13 07:29:27 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-09-13 07:29:27 +0000 |
| commit | 9cfee14217ab844601be9ee710b65e24655b2322 (patch) | |
| tree | 48ee43f8d2686589812ee21bea75fa33ff055143 | |
| parent | 718c8ab94078a7bc23c28da1abdde5b9f2665210 (diff) | |
| download | upstream-9cfee14217ab844601be9ee710b65e24655b2322.tar.gz upstream-9cfee14217ab844601be9ee710b65e24655b2322.tar.bz2 upstream-9cfee14217ab844601be9ee710b65e24655b2322.zip | |
6to4: fix lifetime options (#9147)
SVN-Revision: 28223
| -rw-r--r-- | package/6to4/Makefile | 2 | ||||
| -rwxr-xr-x | package/6to4/files/6to4.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/6to4/Makefile b/package/6to4/Makefile index 14c9f2227d..8cf66c0a28 100644 --- a/package/6to4/Makefile +++ b/package/6to4/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=6to4 -PKG_VERSION:=6 +PKG_VERSION:=7 PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh index 5505d06c55..f7f48e5ba4 100755 --- a/package/6to4/files/6to4.sh +++ b/package/6to4/files/6to4.sh @@ -203,8 +203,8 @@ setup_interface_6to4() { grep -qs "^ *$adv_ifname:" /proc/net/dev && { local adv_valid_lifetime adv_preferred_lifetime - config_get adv_valid_lifetime "${adv_interface:-lan}" adv_valid_lifetime - config_get adv_preferred_lifetime "${adv_interface:-lan}" adv_preferred_lifetime + config_get adv_valid_lifetime "$cfg" adv_valid_lifetime + config_get adv_preferred_lifetime "$cfg" adv_preferred_lifetime local subnet6="$(printf "%s:%x::1/64" "$prefix6" $adv_subnet)" |