packages/openvpn: fix pid-file arg passed in service command-line

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

diff --git a/net/openvpn-devel/Makefile b/net/openvpn-devel/Makefile
index 2261f6c..44ca487 100644 (file)
--- a/net/openvpn-devel/Makefile
+++ b/net/openvpn-devel/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn-devel
 PKG_VERSION:=201120
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=openvpn-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.secure-computing.net/pub/FreeBSD/ports/openvpn-devel \

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 12715d2..53dcd98 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:=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 206763e..3ff1cd6 100644 (file)
--- a/net/openvpn/files/openvpn.init
+++ b/net/openvpn/files/openvpn.init
@@ -107,7 +107,7 @@ start_instance() {
                down push up
 
 
-       SERVICE_PID_FILE="/var/run/openvpn-$s.pid" \
+       SERVICE_PID_FILE="/var/run/openvpn-$s.pid"
        service_start /usr/sbin/openvpn --syslog "openvpn($s)" --writepid "$SERVICE_PID_FILE" $ARGS
 }
 
@@ -116,7 +116,7 @@ stop_instance() {
 
        section_enabled "$s" || return 1
 
-       SERVICE_PID_FILE="/var/run/openvpn-$s.pid" \
+       SERVICE_PID_FILE="/var/run/openvpn-$s.pid"
        service_stop /usr/sbin/openvpn
 }
 
@@ -125,7 +125,7 @@ reload_instance() {
 
        section_enabled "$s" || return 1
 
-       SERVICE_PID_FILE="/var/run/openvpn-$s.pid" \
+       SERVICE_PID_FILE="/var/run/openvpn-$s.pid"
        service_reload /usr/sbin/openvpn
 }