diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-12-30 12:00:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-30 12:00:58 +0100 |
| commit | 39b63971dc754b68f4c85f01415d41ddae7e1687 (patch) | |
| tree | fdaa4588804c613fc3c19afca342886819792700 /src/conf_mode | |
| parent | 865e4290ce1da42df55088bebd3a389cdcf81806 (diff) | |
| parent | 5fcbb5709af063c6f9ffaaa32ede0c9e2787c6f5 (diff) | |
| download | vyos-1x-39b63971dc754b68f4c85f01415d41ddae7e1687.tar.gz vyos-1x-39b63971dc754b68f4c85f01415d41ddae7e1687.zip | |
Merge pull request #2720 from vyos/mergify/bp/sagitta/pr-2718
system: T5877: Shorten system domain-search config path (backport #2718)
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/host_name.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py index 36d1f6493..6204cf247 100755 --- a/src/conf_mode/host_name.py +++ b/src/conf_mode/host_name.py @@ -61,8 +61,9 @@ def get_config(config=None): hosts['domain_name'] = conf.return_value(['system', 'domain-name']) hosts['domain_search'].append(hosts['domain_name']) - for search in conf.return_values(['system', 'domain-search', 'domain']): - hosts['domain_search'].append(search) + if conf.exists(['system', 'domain-search']): + for search in conf.return_values(['system', 'domain-search']): + hosts['domain_search'].append(search) if conf.exists(['system', 'name-server']): for ns in conf.return_values(['system', 'name-server']): |