1 files changed, 11 insertions, 16 deletions
diff --git a/src/conf_mode/dhcpv6_relay.py b/src/conf_mode/dhcpv6_relay.py
index 9355d9794..cb5a4bbfb 100755
--- a/src/conf_mode/dhcpv6_relay.py
+++ b/src/conf_mode/dhcpv6_relay.py
@@ -18,15 +18,13 @@ import os
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
 from vyos.util import call
+from vyos.template import render
 
-
-config_file = r'/etc/default/isc-dhcpv6-relay'
+config_file = r'/run/dhcp-relay/dhcpv6.conf'
 
 default_config_data = {
     'listen_addr': [],
@@ -86,25 +84,22 @@ def generate(relay):
     if relay is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'dhcpv6-relay')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('config.tmpl')
-    config_text = tmpl.render(relay)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
+    # Create configuration directory on demand
+    dirname = os.path.dirname(config_file)
+    if not os.path.isdir(dirname):
+        os.mkdir(dirname)
 
+    render(config_file, 'dhcpv6-relay/config.tmpl', relay)
     return None
 
 def apply(relay):
     if relay is not None:
-        call('sudo systemctl restart isc-dhcpv6-relay.service')
+        call('systemctl restart isc-dhcp-relay6.service')
     else:
         # DHCPv6 relay support is removed in the commit
-        call('sudo systemctl stop isc-dhcpv6-relay.service')
-        os.unlink(config_file)
+        call('systemctl stop isc-dhcp-relay6.service')
+        if os.path.exists(config_file):
+            os.unlink(config_file)
 
     return None