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

SVN-Revision: 26881

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 8cb813f26abb272e5ba078a16445ef4f93982373..4cf8d0eb3d0790342dd2797f78ce320e2a1b52ce 100644 (file)
--- 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 658498d5d8aa85a81f5356c9434ca044e04f170f..0fee06d8d4e4f527f86a42d3ae75cc1b0aff5d9d 100644 (file)
--- 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"