diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-08-09 09:45:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-09 09:45:40 +0200 |
| commit | 98ed11a7d6e35de49f57406a0dd9d4759541f2d4 (patch) | |
| tree | 3eb831987a33c1d86acd6668c034ee25188d21ef /src/conf_mode/service_config_sync.py | |
| parent | 0e92ee262d8ec6ee88d7331f2cbffe8b6b689437 (diff) | |
| parent | 4c5afc9bd6d5acd6089d2b78c03daa65529eaec9 (diff) | |
| download | vyos-1x-98ed11a7d6e35de49f57406a0dd9d4759541f2d4.tar.gz vyos-1x-98ed11a7d6e35de49f57406a0dd9d4759541f2d4.zip | |
Merge pull request #2136 from jestabro/with-defaults
T5319: remove workarounds for incorrect defaults in config-mode scripts
Diffstat (limited to 'src/conf_mode/service_config_sync.py')
| -rwxr-xr-x | src/conf_mode/service_config_sync.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/conf_mode/service_config_sync.py b/src/conf_mode/service_config_sync.py index 5cde735a1..4b8a7f6ee 100755 --- a/src/conf_mode/service_config_sync.py +++ b/src/conf_mode/service_config_sync.py @@ -19,8 +19,6 @@ import json from pathlib import Path from vyos.config import Config -from vyos.configdict import dict_merge -from vyos.xml import defaults from vyos import ConfigError from vyos import airbag @@ -42,12 +40,8 @@ def get_config(config=None): base = ['service', 'config-sync'] if not conf.exists(base): return None - config = conf.get_config_dict(base, - get_first_key=True, - no_tag_node_value_mangle=True) - - default_values = defaults(base) - config = dict_merge(default_values, config) + config = conf.get_config_dict(base, get_first_key=True, + with_recursive_defaults=True) return config |