diff options
author | Arne H Juul <arnej@yahooinc.com> | 2022-02-01 10:39:29 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2022-02-01 10:39:29 +0000 |
commit | b65b71a28a220eb31f49267befc3ed220be30ccb (patch) | |
tree | 87dcc15d77c572c2ac37c1eff75965f2975c30cc /vespabase | |
parent | 2b13a588d7e6403c579facc15c0b598fba123804 (diff) |
move fallback from default-env.txt
Diffstat (limited to 'vespabase')
-rw-r--r-- | vespabase/conf/default-env.txt.in | 1 | ||||
-rwxr-xr-x | vespabase/src/common-env.sh | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/vespabase/conf/default-env.txt.in b/vespabase/conf/default-env.txt.in index a25d31a8a17..56926e32186 100644 --- a/vespabase/conf/default-env.txt.in +++ b/vespabase/conf/default-env.txt.in @@ -2,4 +2,3 @@ fallback VESPA_HOME @CMAKE_INSTALL_PREFIX@ override VESPA_USER @VESPA_USER@ override VESPA_UNPRIVILEGED @VESPA_UNPRIVILEGED@ -fallback NO_VESPAMALLOC_LIST "vespa-rpc-invoke vespa-get-config vespa-sentinel-cmd vespa-route vespa-proton-cmd vespa-configproxy-cmd vespa-config-status" diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index 48f9cc2a4bb..7e1fbf5d06a 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -157,6 +157,7 @@ consider_fallback VESPA_USE_VESPAMALLOC "$(get_var vespamalloc_list)" consider_fallback VESPA_USE_VESPAMALLOC_D "$(get_var vespamallocd_list)" consider_fallback VESPA_USE_VESPAMALLOC_DST "$(get_var vespamallocdst_list)" consider_fallback VESPA_USE_NO_VESPAMALLOC "$(get_var no_vespamalloc_list)" +consider_fallback VESPA_USE_NO_VESPAMALLOC "vespa-rpc-invoke vespa-get-config vespa-sentinel-cmd vespa-route vespa-proton-cmd vespa-configproxy-cmd vespa-config-status" # TODO: # if [ "$VESPA_USE_HUGEPAGES_LIST" = "all" ]; then |