1 files changed, 5 insertions, 16 deletions
diff --git a/src/conf_mode/mdns_repeater.py b/src/conf_mode/mdns_repeater.py
index 2bccd9153..a652553f7 100755
--- a/src/conf_mode/mdns_repeater.py
+++ b/src/conf_mode/mdns_repeater.py
@@ -18,14 +18,12 @@ import os
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 from netifaces import ifaddresses, AF_INET
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
-from vyos.util import run
-
+from vyos.util import call
+from vyos.template import render
 
 config_file = r'/etc/default/mdns-repeater'
 
@@ -82,25 +80,16 @@ def generate(mdns):
         print('Warning: mDNS repeater will be deactivated because it is disabled')
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'mdns-repeater')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('mdns-repeater.tmpl')
-    config_text = tmpl.render(mdns)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'mdns-repeater/mdns-repeater.tmpl', mdns)
     return None
 
 def apply(mdns):
     if (mdns is None) or mdns['disabled']:
-        run('sudo systemctl stop mdns-repeater')
+        call('systemctl stop mdns-repeater.service')
         if os.path.exists(config_file):
             os.unlink(config_file)
     else:
-        run('sudo systemctl restart mdns-repeater')
+        call('systemctl restart mdns-repeater.service')
 
     return None