From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 17 Jul 2018 14:01:46 +0000 (+0200)
Subject: openvpn: increase procd termination timeout to 15s
X-Git-Tag: v18.06.2~209
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0282d04a85b3c5232742e9084a165d1b5406a0af;p=oweals%2Fopenwrt.git

openvpn: increase procd termination timeout to 15s

Increase the termination timeout to 15s to let OpenVPN properly tear down
its connections, especially when weak links or complex down scripts are
involved.

Fixes FS#859.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from 28d3a1b54b6726a0a93477d75d09a25f74ee361f)
---

diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile
index ae49d4dc68..360ee56fa7 100644
--- a/package/network/services/openvpn/Makefile
+++ b/package/network/services/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openvpn
 
 PKG_VERSION:=2.4.5
-PKG_RELEASE:=4.1
+PKG_RELEASE:=4.2
 
 PKG_SOURCE_URL:=\
 	https://build.openvpn.net/downloads/releases/ \
diff --git a/package/network/services/openvpn/files/openvpn.init b/package/network/services/openvpn/files/openvpn.init
index ab4f7dba0d..7e6cfd9c35 100644
--- a/package/network/services/openvpn/files/openvpn.init
+++ b/package/network/services/openvpn/files/openvpn.init
@@ -67,6 +67,7 @@ openvpn_add_instance() {
 		--cd "$dir" \
 		--config "$conf"
 	procd_set_param file "$dir/$conf"
+	procd_set_param term_timeout 15
 	procd_set_param respawn
 	procd_append_param respawn 3600
 	procd_append_param respawn 5