aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2013-06-11 20:52:27 +0000
committerSteven Barth <cyrus@openwrt.org>2013-06-11 20:52:27 +0000
commit4f0a0defa6b4ad7a6bfc986fe43e0829c8ac5bd3 (patch)
treed76b5c06c9a6655a1efd9fdaf7ec283195ef8ad4
parent33c620773dba85ccc93dad328b71aaee54bbbb3b (diff)
downloadupstream-4f0a0defa6b4ad7a6bfc986fe43e0829c8ac5bd3.tar.gz
upstream-4f0a0defa6b4ad7a6bfc986fe43e0829c8ac5bd3.tar.bz2
upstream-4f0a0defa6b4ad7a6bfc986fe43e0829c8ac5bd3.zip
6relayd: make route preference and prefix on-link flag configurable
SVN-Revision: 36922
-rw-r--r--package/network/ipv6/6relayd/Makefile4
-rw-r--r--package/network/ipv6/6relayd/files/6relayd.init8
2 files changed, 10 insertions, 2 deletions
diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile
index 2bc54670e5..6bd565103c 100644
--- a/package/network/ipv6/6relayd/Makefile
+++ b/package/network/ipv6/6relayd/Makefile
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=6relayd
-PKG_VERSION:=2013-06-01
+PKG_VERSION:=2013-06-11
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=git://github.com/sbyx/6relayd.git
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9fc96765899e88d9219669b1b1db9ad3c63d2bf4
+PKG_SOURCE_VERSION:=8f107ae49698740f374d8adafa90ff5da459d1ec
PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
diff --git a/package/network/ipv6/6relayd/files/6relayd.init b/package/network/ipv6/6relayd/files/6relayd.init
index b26d6c5e3d..89b8610b49 100644
--- a/package/network/ipv6/6relayd/files/6relayd.init
+++ b/package/network/ipv6/6relayd/files/6relayd.init
@@ -95,6 +95,14 @@ start_6relayd() {
config_get management_level "$cfg" management_level
[ -n "$management_level" ] && append args "-m$management_level"
+ local management_offlink
+ config_get_bool management_offlink "$cfg" management_offlink 0
+ [ "$management_offlink" -eq 1 ] && append args "-o"
+
+ local management_preference
+ config_get management_preference "$cfg" management_preference
+ [ -n "$management_preference" ] && append args "-i$management_preference"
+
config_foreach add_static_lease lease
[ "$ndp" = "relay" ] && append args "-N -s"