1 files changed, 5 insertions, 14 deletions
diff --git a/src/conf_mode/tftp_server.py b/src/conf_mode/tftp_server.py
index df8155084..94c8bcf03 100755
--- a/src/conf_mode/tftp_server.py
+++ b/src/conf_mode/tftp_server.py
@@ -20,14 +20,13 @@ import pwd
 
 from copy import deepcopy
 from glob import glob
-from jinja2 import FileSystemLoader, Environment
 from sys import exit
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos.validate import is_ipv4, is_addr_assigned
 from vyos import ConfigError
-from vyos.util import run
+from vyos.util import call
+from vyos.template import render
 
 
 config_file = r'/etc/default/tftpd'
@@ -90,11 +89,6 @@ def generate(tftpd):
     if tftpd is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'tftp-server')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
     idx = 0
     for listen in tftpd['listen']:
         config = deepcopy(tftpd)
@@ -103,11 +97,8 @@ def generate(tftpd):
         else:
             config['listen'] = ["[" + listen + "]" + tftpd['port'] + " -6"]
 
-        tmpl = env.get_template('default.tmpl')
-        config_text = tmpl.render(config)
         file = config_file + str(idx)
-        with open(file, 'w') as f:
-            f.write(config_text)
+        render(file, 'tftp-server/default.tmpl', config)
 
         idx = idx + 1
 
@@ -115,7 +106,7 @@ def generate(tftpd):
 
 def apply(tftpd):
     # stop all services first - then we will decide
-    run('systemctl stop tftpd@{0..20}')
+    call('systemctl stop tftpd@{0..20}.service')
 
     # bail out early - e.g. service deletion
     if tftpd is None:
@@ -140,7 +131,7 @@ def apply(tftpd):
 
     idx = 0
     for listen in tftpd['listen']:
-        run('systemctl restart tftpd@{0}.service'.format(idx))
+        call('systemctl restart tftpd@{0}.service'.format(idx))
         idx = idx + 1
 
     return None