From a676c91105e3df96bc0e709b397f2ac6ceb2070f Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 11 Dec 2019 09:44:22 -0600 Subject: vyos.config: T1846: ignore edit level when obtaining running config In addition to ignoring edit level for the session config (12a21a4b), the running config should be parsed from the top level. --- python/vyos/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/vyos') diff --git a/python/vyos/config.py b/python/vyos/config.py index 441944338..27422786e 100644 --- a/python/vyos/config.py +++ b/python/vyos/config.py @@ -99,7 +99,7 @@ class Config(object): # Running config can be obtained either from op or conf mode, it always succeeds # (if config system is initialized at all). if os.path.isfile('/tmp/vyos-config-status'): - running_config_text = self._run([self._cli_shell_api, '--show-active-only', '--show-show-defaults', 'showConfig']) + running_config_text = self._run([self._cli_shell_api, '--show-active-only', '--show-show-defaults', '--show-ignore-edit', 'showConfig']) else: with open('/opt/vyatta/etc/config/config.boot') as f: running_config_text = f.read() -- cgit v1.2.3