Merge r14423

SVN-Revision: 14424

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 8b36a35ed28c4d5ef5a4305a8dfe9a51308e00af..55bf4f56a11c6b8500b7907cdcb93ae513b3f95f 100644 (file)
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
 PKG_VERSION:=2.0.9
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn

diff --git a/net/openvpn/files/openvpn.init b/net/openvpn/files/openvpn.init
index 18616eac00c45e8a8031c88a51a296c10b02f557..9a548cd3f21cf23d3fd1973a1d19701931d164bf 100644 (file)
--- a/net/openvpn/files/openvpn.init
+++ b/net/openvpn/files/openvpn.init
@@ -104,7 +104,7 @@ start_service() {
 
 
        [ -n "$ARGS" ] && \
-               eval "$SSD -q -b -m -p $PID -x $BIN -S -- --syslog 'openvpn($s)' $ARGS"
+               eval "$SSD -q -b -p '$PID' -x $BIN -S -- --syslog 'openvpn($s)' --writepid '$PID' $ARGS"
 }
 
 kill_service() {