summaryrefslogtreecommitdiff
path: root/src/op_mode/reset_openvpn.py
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-07-07 19:49:07 +0200
committerGitHub <noreply@github.com>2022-07-07 19:49:07 +0200
commitff2665175fe58bff6f76f5ee57ebee6de838dbc5 (patch)
tree14ca1fe630f3ba4f7a0afdfd5c000037f1224dc5 /src/op_mode/reset_openvpn.py
parent9403fda1e0a3bc0284a97b852f6501080523ffe5 (diff)
parent28ba0ef32425ee458293a37a4a5ba664dfe577b2 (diff)
downloadvyos-1x-ff2665175fe58bff6f76f5ee57ebee6de838dbc5.tar.gz
vyos-1x-ff2665175fe58bff6f76f5ee57ebee6de838dbc5.zip
Merge pull request #1397 from sever-sever/T4503
op-mode: T4503: Prevent restart service if commit in progress
Diffstat (limited to 'src/op_mode/reset_openvpn.py')
-rwxr-xr-xsrc/op_mode/reset_openvpn.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/op_mode/reset_openvpn.py b/src/op_mode/reset_openvpn.py
index dbd3eb4d1..efbf65083 100755
--- a/src/op_mode/reset_openvpn.py
+++ b/src/op_mode/reset_openvpn.py
@@ -17,6 +17,7 @@
import os
from sys import argv, exit
from vyos.util import call
+from vyos.util import commit_in_progress
if __name__ == '__main__':
if (len(argv) < 1):
@@ -25,6 +26,9 @@ if __name__ == '__main__':
interface = argv[1]
if os.path.isfile(f'/run/openvpn/{interface}.conf'):
+ if commit_in_progress():
+ print('Cannot restart OpenVPN while a commit is in progress')
+ exit(1)
call(f'systemctl restart openvpn@{interface}.service')
else:
print(f'OpenVPN interface "{interface}" does not exist!')