Merge pull request #91 from jestabro/config-default-system-version

migration: T6006: add vyos data dir
vyos · Jun 6, 2024 · 5c657da · 5c657da
2 parents fe13cfa + fb25540
commit 5c657da
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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}"