diff options
| author | John Estabrook <jestabro@vyos.io> | 2024-06-06 07:20:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-06 07:20:09 -0500 |
| commit | 5c657da5f0eb34b9cd81c0b130d8e9af7e8a2fbd (patch) | |
| tree | 0b324f07b69f72fcc35f63b3a36bdcc7fb349ada | |
| parent | fe13cfa6f5560197cb69b185994165cacc534c0d (diff) | |
| parent | fb25540b4c1fc8588a501c217076752ae27f93c4 (diff) | |
| download | vyatta-op-5c657da5f0eb34b9cd81c0b130d8e9af7e8a2fbd.tar.gz vyatta-op-5c657da5f0eb34b9cd81c0b130d8e9af7e8a2fbd.zip | |
Merge pull request #91 from jestabro/config-default-system-version
migration: T6006: add vyos data dir
| -rw-r--r-- | etc/default/vyatta.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/default/vyatta.in b/etc/default/vyatta.in index 909f124..5e6efc5 100644 --- a/etc/default/vyatta.in +++ b/etc/default/vyatta.in @@ -158,6 +158,7 @@ unset _vyatta_extglob declare -x -r vyos_libexec_dir=/usr/libexec/vyos declare -x -r vyos_bin_dir=/usr/bin declare -x -r vyos_sbin_dir=/usr/sbin + declare -x -r vyos_share_dir=/usr/share if test -z "$vyos_conf_scripts_dir" ; then declare -x -r vyos_conf_scripts_dir=$vyos_libexec_dir/conf_mode @@ -171,6 +172,9 @@ unset _vyatta_extglob if test -z "$vyos_validators_dir" ; then declare -x -r vyos_validators_dir=$vyos_libexec_dir/validators fi + if test -z "$vyos_data_dir" ; then + declare -x -r vyos_data_dir=$vyos_share_dir/vyos + fi if test -z "$vyos_persistence_dir" ; then UNION_NAME=$(cat /proc/cmdline | sed -e s+^.*vyos-union=++ | sed -e 's/ .*$//') declare -x -r vyos_persistence_dir="/usr/lib/live/mount/persistence/${UNION_NAME}" |