aboutsummaryrefslogtreecommitdiffstats
path: root/package/6relayd
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2013-06-11 20:54:10 +0000
committerSteven Barth <steven@midlink.org>2013-06-11 20:54:10 +0000
commitf3f8530f81aa560fa5ed7f5aa19e0e23b2e99159 (patch)
treeb8c8dceb010dd4c0d6fa58f6f38d46a0af36c447 /package/6relayd
parent3f309c015ef0ff626a6ac7d7fdcad761cfba57bf (diff)
downloadupstream-f3f8530f81aa560fa5ed7f5aa19e0e23b2e99159.tar.gz
upstream-f3f8530f81aa560fa5ed7f5aa19e0e23b2e99159.tar.bz2
upstream-f3f8530f81aa560fa5ed7f5aa19e0e23b2e99159.zip
AA: 6relayd: backport r36922
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36923 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/6relayd')
-rw-r--r--package/6relayd/Makefile4
-rw-r--r--package/6relayd/files/6relayd.init8
2 files changed, 10 insertions, 2 deletions
diff --git a/package/6relayd/Makefile b/package/6relayd/Makefile
index 72ff4d25e5..d6d394d114 100644
--- a/package/6relayd/Makefile
+++ b/package/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/6relayd/files/6relayd.init b/package/6relayd/files/6relayd.init
index b26d6c5e3d..89b8610b49 100644
--- a/package/6relayd/files/6relayd.init
+++ b/package/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"