diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/system-logs.py | 10 | 
1 files changed, 3 insertions, 7 deletions
diff --git a/src/conf_mode/system-logs.py b/src/conf_mode/system-logs.py index 12145d641..8ad4875d4 100755 --- a/src/conf_mode/system-logs.py +++ b/src/conf_mode/system-logs.py @@ -19,11 +19,9 @@ from sys import exit  from vyos import ConfigError  from vyos import airbag  from vyos.config import Config -from vyos.configdict import dict_merge  from vyos.logger import syslog  from vyos.template import render  from vyos.utils.dict import dict_search -from vyos.xml import defaults  airbag.enable()  # path to logrotate configs @@ -38,11 +36,9 @@ def get_config(config=None):          conf = Config()      base = ['system', 'logs'] -    default_values = defaults(base) -    logs_config = conf.get_config_dict(base, -                                       key_mangling=('-', '_'), -                                       get_first_key=True) -    logs_config = dict_merge(default_values, logs_config) +    logs_config = conf.get_config_dict(base, key_mangling=('-', '_'), +                                       get_first_key=True, +                                       with_recursive_defaults=True)      return logs_config  | 
