summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@sentrium.io>2019-12-11 09:44:22 -0600
committerJohn Estabrook <jestabro@sentrium.io>2019-12-11 10:33:58 -0600
commita676c91105e3df96bc0e709b397f2ac6ceb2070f (patch)
tree20d425077464f7de1d935c7018b72b3d2f7928eb
parentfa85664ba050dab99d18d5d05018eea6a0fb0879 (diff)
downloadvyos-1x-a676c91105e3df96bc0e709b397f2ac6ceb2070f.tar.gz
vyos-1x-a676c91105e3df96bc0e709b397f2ac6ceb2070f.zip
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.
-rw-r--r--python/vyos/config.py2
1 files changed, 1 insertions, 1 deletions
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()