Merge remote-tracking branch 'upstream/current' into current

1 files changed, 10 insertions, 10 deletions

diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py
index f2fa64233..f4c75c257 100755
--- a/src/conf_mode/host_name.py
+++ b/src/conf_mode/host_name.py
@@ -18,20 +18,16 @@
 conf-mode script for 'system host-name' and 'system domain-name'.
 """
 
-import os
 import re
 import sys
 import copy
-import glob
-import argparse
-import jinja2
 
 import vyos.util
 import vyos.hostsd_client
 
 from vyos.config import Config
 from vyos import ConfigError
-from vyos.util import cmd, call, run, process_named_running
+from vyos.util import cmd, call, process_named_running
 
 from vyos import airbag
 airbag.enable()
@@ -47,7 +43,12 @@ default_config_data = {
 
 hostsd_tag = 'system'
 
-def get_config(conf):
+def get_config(config=None):
+    if config:
+        conf = config
+    else:
+        conf = Config()
+
     hosts = copy.deepcopy(default_config_data)
 
     hosts['hostname'] = conf.return_value("system host-name")
@@ -77,7 +78,7 @@ def get_config(conf):
     return hosts
 
 
-def verify(conf, hosts):
+def verify(hosts):
     if hosts is None:
         return None
 
@@ -168,9 +169,8 @@ def apply(config):
 
 if __name__ == '__main__':
     try:
-        conf = Config()
-        c = get_config(conf)
-        verify(conf, c)
+        c = get_config()
+        verify(c)
         generate(c)
         apply(c)
     except ConfigError as e: