[PATCH] OpenVPN: Add to update and exclude

[Erik Kapfer <ummeegge@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 1520 bytes --]

Since some OpenVPN updates did not apply, the service will be stopped before the update to prevent 'Text file busy' and start up again.

Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
---
 config/rootfiles/core/144/exclude   |  1 +
 config/rootfiles/core/144/update.sh | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/config/rootfiles/core/144/exclude b/config/rootfiles/core/144/exclude
index b22159878..ba1b646e6 100644
--- a/config/rootfiles/core/144/exclude
+++ b/config/rootfiles/core/144/exclude
@@ -24,5 +24,6 @@ var/lib/alternatives
 var/log/cache
 var/log/dhcpcd.log
 var/log/messages
+var/ipfire/ovpn
 var/state/dhcp/dhcpd.leases
 var/updatecache
diff --git a/config/rootfiles/core/144/update.sh b/config/rootfiles/core/144/update.sh
index 6a9c51931..81a6c626e 100644
--- a/config/rootfiles/core/144/update.sh
+++ b/config/rootfiles/core/144/update.sh
@@ -47,6 +47,15 @@ done
 # Remove files
 
 # Stop services
+# Stop OpenVPN server if it runs
+if pgrep openvpn -fl | grep 'server.conf' >/dev/null 2>&1; then
+	/usr/local/bin/openvpnctrl -k
+fi
+
+# Stop OpenVPN N2N if it runs
+if pgrep openvpn -fl | grep 'n2nconf' >/dev/null 2>&1; then
+	/usr/local/bin/openvpnctrl -kn2n
+fi
 
 # Extract files
 extract_files
@@ -55,6 +64,9 @@ extract_files
 ldconfig
 
 # Start services
+# Start OpenVPN again
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
 
 # Update Language cache
 /usr/local/bin/update-lang-cache
-- 
2.20.1