From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 13 May 2011 06:31:41 +0000 (+0000)
Subject: openvpn: stop instances even if they are disabled (#9404)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=db0bd7b835165058d0bf16d6970cd4779219d2de;p=openwrt%2Fsvn-archive%2Fpackages.git

openvpn: stop instances even if they are disabled (#9404)

SVN-Revision: 26881
---

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 8cb813f26..4cf8d0eb3 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
 PKG_VERSION:=2.1.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://swupdate.openvpn.net/community/releases @SF/openvpn
diff --git a/net/openvpn/files/openvpn.init b/net/openvpn/files/openvpn.init
index 658498d5d..0fee06d8d 100644
--- a/net/openvpn/files/openvpn.init
+++ b/net/openvpn/files/openvpn.init
@@ -115,7 +115,7 @@ kill_service() {
 
 	# disabled?
 	config_get_bool enable "$s" enable 0
-	[ "$enable" == 0 ] && return 0
+	[ "$enable" == 1 ] || [ "$S" == "TERM" ] || return 0
 
 	PID="/var/run/openvpn-$s.pid"