From 1e739bdd2eb96b84b0349fb06c0c3fc658ca26e2 Mon Sep 17 00:00:00 2001 From: cyrus Date: Tue, 11 Jun 2013 20:54:10 +0000 Subject: [PATCH] AA: 6relayd: backport r36922 git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36923 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/6relayd/Makefile | 4 ++-- package/6relayd/files/6relayd.init | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/6relayd/Makefile b/package/6relayd/Makefile index 72ff4d2..d6d394d 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 diff --git a/package/6relayd/files/6relayd.init b/package/6relayd/files/6relayd.init index b26d6c5..89b8610 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" -- 2.11.0