diff options
| author | Indrajit Raychaudhuri <irc@indrajit.com> | 2023-12-29 15:06:27 -0600 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-12-30 09:44:15 +0000 |
| commit | 0fb8c4142d7910e14fff71f6365c64865b4d0d0b (patch) | |
| tree | 3e81218f734f3be180ed23d175d4638db76e08e1 /src/conf_mode | |
| parent | 93427954f3abbce755847e61d0dd6471dce1bdd9 (diff) | |
| download | vyos-1x-0fb8c4142d7910e14fff71f6365c64865b4d0d0b.tar.gz vyos-1x-0fb8c4142d7910e14fff71f6365c64865b4d0d0b.zip | |
system: T5877: Shorten system domain-search config path
Shorten and simplify `system domain-search` config path from:
```
set system domain-search domain <domain1>
```
to:
```
set system domain-search <domain1>
```
This will shorten the path and also make consistent with `domain-search`
config in other places (like `dhcp-server`).
(cherry picked from commit f77bf573c608b6c09182e1bad4312c4dd1e5195e)
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']): |