From: Dirk Brenken <dev@brenken.org>
Date: Mon, 19 Feb 2024 13:54:08 +0000 (+0100)
Subject: openvpn: fix start_path_instance function
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=fe736b2f8c415e6d590931f1f1f504e1d18c579b;p=feed%2Fpackages.git

openvpn: fix start_path_instance function

Check the conffile existance (with .conf extension), before calling the
function 'start_path_instance'. This fixes errors with non-existing and
wrong spelling instances.

Signed-off-by: Dirk Brenken <dev@brenken.org>
- Update commit description
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 365fed6c71..8d35c74770 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openvpn
 
 PKG_VERSION:=2.6.8
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE_URL:=\
 	https://build.openvpn.net/downloads/releases/ \
diff --git a/net/openvpn/files/openvpn.init b/net/openvpn/files/openvpn.init
index 89d25b59cc..5c1beb0e33 100644
--- a/net/openvpn/files/openvpn.init
+++ b/net/openvpn/files/openvpn.init
@@ -281,7 +281,7 @@ start_service() {
 	if [ -n "$instance" ]; then
 		if [ "$instance_found" -gt 0 ]; then
 			start_uci_instance "$instance"
-		else
+		elif [ -f "${PATH_INSTANCE_DIR}/${instance}.conf" ]; then
 			start_path_instance "$instance"
 		fi
 	else
@@ -299,4 +299,3 @@ start_service() {
 service_triggers() {
 	procd_add_reload_trigger openvpn
 }
-