From 37a4d98daee93f57c19d3889e0e660c7645d6303 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Fri, 12 Jul 2019 15:36:11 +0200 Subject: Do not try to verify the config when host_name.py is called from dhclient script. --- src/conf_mode/host_name.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/conf_mode/host_name.py') diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py index 27cc336d8..651c1c392 100755 --- a/src/conf_mode/host_name.py +++ b/src/conf_mode/host_name.py @@ -110,6 +110,8 @@ def get_config(arguments): conf.return_values = conf.return_effective_values hosts['hostname'] = conf.return_value("system host-name") + if not hosts['hostname']: + hosts['hostname'] = default_config_data['hostname'] hosts['domain_name'] = conf.return_value("system domain-name") if hosts['domain_name']: @@ -226,7 +228,8 @@ if __name__ == '__main__': try: c = get_config(args) - verify(c) + if not args.dhclient: + verify(c) generate(c) apply(c) except ConfigError as e: -- cgit v1.2.3