diff options
author | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-03-23 22:47:19 +0000 |
---|---|---|
committer | Thomas Mangin <thomas.mangin@exa.net.uk> | 2020-03-23 23:04:18 +0000 |
commit | 8f39784c847801c0b766a0c9289da0976ffd0604 (patch) | |
tree | f99c84bbf2a78aa3e9278f276a18336cad047520 /src/conf_mode/interfaces-openvpn.py | |
parent | 71561a27a0338cba7c54ea8ae9bf14b75006ddbd (diff) | |
download | vyos-1x-8f39784c847801c0b766a0c9289da0976ffd0604.tar.gz vyos-1x-8f39784c847801c0b766a0c9289da0976ffd0604.zip |
ifconfig: T2154: fixing failure to start-stop-daemon
Diffstat (limited to 'src/conf_mode/interfaces-openvpn.py')
-rwxr-xr-x | src/conf_mode/interfaces-openvpn.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/conf_mode/interfaces-openvpn.py b/src/conf_mode/interfaces-openvpn.py index 463ae9fd7..3a3c69e37 100755 --- a/src/conf_mode/interfaces-openvpn.py +++ b/src/conf_mode/interfaces-openvpn.py @@ -958,7 +958,10 @@ def apply(openvpn): # service as the configuration is not re-read. Stop daemon only if it's # running - it could have died or killed by someone evil if pid_exists(pid): - cmd = 'start-stop-daemon --stop --quiet' + cmd = 'start-stop-daemon' + cmd += ' --stop ' + cmd += ' --quiet' + cmd += ' --oknodo' cmd += ' --pidfile ' + pidfile subprocess_cmd(cmd) @@ -990,7 +993,10 @@ def apply(openvpn): # No matching OpenVPN process running - maybe it got killed or none # existed - nevertheless, spawn new OpenVPN process - cmd = 'start-stop-daemon --start --quiet' + cmd = 'start-stop-daemon' + cmd += ' --start ' + cmd += ' --quiet' + cmd += ' --oknodo' cmd += ' --pidfile ' + pidfile cmd += ' --exec /usr/sbin/openvpn' # now pass arguments to openvpn binary |