From 43f14b81120a79d6d073752508264a410bceadea Mon Sep 17 00:00:00 2001 From: Eric Luehrsen Date: Mon, 25 Jun 2018 20:40:21 -0400 Subject: [PATCH] unbound: limit outside script source to init funciton scope Signed-off-by: Eric Luehrsen --- net/unbound/Makefile | 4 ++-- net/unbound/files/unbound.init | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/net/unbound/Makefile b/net/unbound/Makefile index 5adcd867e7..c28b2a003e 100644 --- a/net/unbound/Makefile +++ b/net/unbound/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unbound PKG_VERSION:=1.6.8 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Eric Luehrsen +PKG_MAINTAINER:=Eric Luehrsen PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.unbound.net/downloads diff --git a/net/unbound/files/unbound.init b/net/unbound/files/unbound.init index 1edf9ef80d..08514cc079 100755 --- a/net/unbound/files/unbound.init +++ b/net/unbound/files/unbound.init @@ -16,10 +16,6 @@ PROG=/usr/sbin/unbound ############################################################################## -. /usr/lib/unbound/unbound.sh - -############################################################################## - boot() { UNBOUND_BOOT=1 start "$@" @@ -34,10 +30,11 @@ start_service() { fi # complex UCI work + . /usr/lib/unbound/unbound.sh unbound_start # standard procd clause - procd_open_instance + procd_open_instance "unbound" procd_set_param command $PROG -d -c $UNBOUND_CONFFILE procd_set_param respawn procd_close_instance @@ -46,6 +43,8 @@ start_service() { ############################################################################## stop_service() { + # clean up + . /usr/lib/unbound/unbound.sh unbound_stop # Wait! on restart Unbound may take time writing closure stats to syslog -- 2.30.2