summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2025-06-23 13:54:05 -0500
committerJohn Estabrook <jestabro@vyos.io>2025-07-08 08:26:11 -0500
commit05db4cdef55acc1a5869dabaab60264074c30c7d (patch)
tree8bae53b19c0838c34af016a78c99d6696dc43965 /python
parent5e333ccf4a4ddabbb61042d5b347de54845d60c0 (diff)
downloadvyos-1x-05db4cdef55acc1a5869dabaab60264074c30c7d.tar.gz
vyos-1x-05db4cdef55acc1a5869dabaab60264074c30c7d.zip
T7499: update vyos-merge-config.py script to use tree merge function
Diffstat (limited to 'python')
-rw-r--r--python/vyos/config.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/python/vyos/config.py b/python/vyos/config.py
index 6ba8834cb..6f7c76ca7 100644
--- a/python/vyos/config.py
+++ b/python/vyos/config.py
@@ -134,9 +134,11 @@ class Config(object):
subtrees.
"""
def __init__(self, session_env=None, config_source=None):
+ self.vyconf_session = None
if config_source is None:
if vyconf_backend() and boot_configuration_complete():
self._config_source = ConfigSourceVyconfSession(session_env)
+ self.vyconf_session = self._config_source._vyconf_session
else:
self._config_source = ConfigSourceSession(session_env)
else: