[packages] openvpn: stop instances even if they are disabled (#9404)
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 13 May 2011 06:31:41 +0000 (06:31 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 13 May 2011 06:31:41 +0000 (06:31 +0000)
SVN-Revision: 26881

net/openvpn/Makefile
net/openvpn/files/openvpn.init

index 8cb813f..4cf8d0e 100644 (file)
@@ -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
index 658498d..0fee06d 100644 (file)
@@ -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"