summaryrefslogtreecommitdiff
path: root/python/vyos/defaults.py
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-06-24 19:05:54 +0200
committerGitHub <noreply@github.com>2024-06-24 19:05:54 +0200
commit340e44c59663d2b94e7b1fddb05c49a3ad737938 (patch)
treec9049d3911b4bfbeec7c938122213dd47cad0a62 /python/vyos/defaults.py
parentae8390a110ec4c507aad8eca252b3153ae1f3316 (diff)
parent8603967cbd7eb1ecdbad2e0960d1a18c667d38a3 (diff)
downloadvyos-1x-340e44c59663d2b94e7b1fddb05c49a3ad737938.tar.gz
vyos-1x-340e44c59663d2b94e7b1fddb05c49a3ad737938.zip
Merge pull request #3717 from vyos/mergify/bp/circinus/pr-3652
T6489: Add support for CLI config scripts that change the underlaying working configuration (backport #3652)
Diffstat (limited to 'python/vyos/defaults.py')
-rw-r--r--python/vyos/defaults.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/python/vyos/defaults.py b/python/vyos/defaults.py
index e7cd69a8b..9ccd925ce 100644
--- a/python/vyos/defaults.py
+++ b/python/vyos/defaults.py
@@ -1,4 +1,4 @@
-# Copyright 2018-2023 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 2018-2024 VyOS maintainers and contributors <maintainers@vyos.io>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -35,6 +35,7 @@ directories = {
'vyos_udev_dir' : '/run/udev/vyos',
'isc_dhclient_dir' : '/run/dhclient',
'dhcp6_client_dir' : '/run/dhcp6c',
+ 'vyos_configdir' : '/opt/vyatta/config'
}
config_status = '/tmp/vyos-config-status'
@@ -44,7 +45,7 @@ cfg_group = 'vyattacfg'
cfg_vintage = 'vyos'
-commit_lock = '/opt/vyatta/config/.lock'
+commit_lock = os.path.join(directories['vyos_configdir'], '.lock')
component_version_json = os.path.join(directories['data'], 'component-versions.json')