summaryrefslogtreecommitdiff
path: root/python/vyos
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@sentrium.io>2019-05-28 14:39:39 -0500
committerJohn Estabrook <jestabro@sentrium.io>2019-05-29 08:17:22 -0500
commit456abc2aa4ae10981c2aec2d2e6d975ef30fb8d6 (patch)
tree2c6dabba3712f9f05662844fbd4b9994ce937a05 /python/vyos
parentdf231744b98202ec5fbcd236e795df7399747a0e (diff)
downloadvyos-1x-456abc2aa4ae10981c2aec2d2e6d975ef30fb8d6.tar.gz
vyos-1x-456abc2aa4ae10981c2aec2d2e6d975ef30fb8d6.zip
T1397: Rewrite the config merge script
Add the script vyos-merge-config.py to separate the merge function from the config load script and remove dependency on XorpConfigParser.
Diffstat (limited to 'python/vyos')
-rw-r--r--python/vyos/defaults.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/python/vyos/defaults.py b/python/vyos/defaults.py
index 36185f16a..0603efc42 100644
--- a/python/vyos/defaults.py
+++ b/python/vyos/defaults.py
@@ -15,7 +15,8 @@
directories = {
- "data": "/usr/share/vyos/"
+ "data": "/usr/share/vyos/",
+ "config": "/opt/vyatta/etc/config"
}
cfg_group = 'vyattacfg'