[packages] openvpn: accept both "option enable" and "option enabled"

git-svn-id: svn://svn.openwrt.org/openwrt/packages@29355 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 53dcd98..c80c587 100644 (file)
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
 PKG_VERSION:=2.2.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 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 3ff1cd6..c5f3f95 100644 (file)
--- a/net/openvpn/files/openvpn.init
+++ b/net/openvpn/files/openvpn.init
@@ -58,8 +58,9 @@ append_params_quoted() {
 }
 
 section_enabled() {
+       config_get_bool enable  "$1" 'enable'  0
        config_get_bool enabled "$1" 'enabled' 0
-       [ $enabled -gt 0 ]
+       [ $enable -gt 0 ] || [ $enabled -gt 0 ]
 }
 
 start_instance() {