diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-06-15 08:02:49 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-06-24 14:08:26 +0000 |
| commit | 3e285639c9ebd4a415d1abbb738eecf3445e14fd (patch) | |
| tree | a5006d1ceab401ab88b1e1317e733090cc814b25 /python/vyos/defaults.py | |
| parent | ae8390a110ec4c507aad8eca252b3153ae1f3316 (diff) | |
| download | vyos-1x-3e285639c9ebd4a415d1abbb738eecf3445e14fd.tar.gz vyos-1x-3e285639c9ebd4a415d1abbb738eecf3445e14fd.zip | |
T6489: add vyos_configdir to the dictionary of default directories
(cherry picked from commit f0923acffbef04c1f8cf2a6c8a9e2afd66c4a494)
Diffstat (limited to 'python/vyos/defaults.py')
| -rw-r--r-- | python/vyos/defaults.py | 5 |
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') |