From cd2147cfa2dc3202fa044b17592a6ddb28275daa Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 23 Feb 2020 19:52:59 +0100
Subject: openvpn: T2065: move daemon parameter to start-stop-daemon
 command-line

---
 src/conf_mode/interfaces-openvpn.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/conf_mode')

diff --git a/src/conf_mode/interfaces-openvpn.py b/src/conf_mode/interfaces-openvpn.py
index 3a7bc6611..6bd269e97 100755
--- a/src/conf_mode/interfaces-openvpn.py
+++ b/src/conf_mode/interfaces-openvpn.py
@@ -51,7 +51,6 @@ config_tmpl = """
 verb 3
 status /opt/vyatta/etc/openvpn/status/{{ intf }}.status 30
 writepid /var/run/openvpn/{{ intf }}.pid
-daemon openvpn-{{ intf }}
 
 dev-type {{ type }}
 dev {{ intf }}
@@ -224,7 +223,7 @@ cipher aes-256-cbc
 
 {%- if ncp_ciphers %}
 ncp-ciphers {{ncp_ciphers}}
-{% endif %} 
+{% endif %}
 {%- if disable_ncp %}
 ncp-disable
 {% endif %}
@@ -968,6 +967,7 @@ def apply(openvpn):
     cmd += ' --exec /usr/sbin/openvpn'
     # now pass arguments to openvpn binary
     cmd += ' --'
+    cmd += ' --daemon openvpn-' + openvpn['intf']
     cmd += ' --config ' + get_config_name(openvpn['intf'])
 
     # execute assembled command
-- 
cgit v1.2.3