diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-03-24 07:10:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-24 07:10:47 +0100 |
| commit | acb9815216dfe48c9d8684056381d9cd7b10fee0 (patch) | |
| tree | 9c011c37f08d2ed747b10ef90198103e07dd38da /src/conf_mode/interfaces-openvpn.py | |
| parent | 92e6efeec0e46570daacd5d96e754a3c89868e0b (diff) | |
| parent | 8f39784c847801c0b766a0c9289da0976ffd0604 (diff) | |
| download | vyos-1x-acb9815216dfe48c9d8684056381d9cd7b10fee0.tar.gz vyos-1x-acb9815216dfe48c9d8684056381d9cd7b10fee0.zip | |
Merge pull request #261 from thomas-mangin/2154
ethernet: T2154: do not report errors where none are
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 |