diff options
| author | Arne H Juul <arnej@yahoo-inc.com> | 2016-07-07 14:01:14 +0200 |
|---|---|---|
| committer | Arne H Juul <arnej@yahoo-inc.com> | 2016-07-07 14:01:14 +0200 |
| commit | 5b63a058c63a3055a67d91b12b9ae75eae82f928 (patch) | |
| tree | c0a939c4a9ec5b2a7d6af7f3118b34c0706d9cab /vespabase | |
| parent | 2cf46bafea51a5e22195ae445ab474da8ebe318a (diff) | |
use new code to find configservers
* use binary from vespa_defaults instead of old perl code.
This is mainly to allow VESPA_CONFIGSERVERS environment
configuration to work.
* Also, remove duplicate sourcing of common-env.sh
Diffstat (limited to 'vespabase')
| -rwxr-xr-x | vespabase/src/common-env.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index e2e20b9bd8f..4c26e0e9396 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -221,7 +221,7 @@ no_transparent_hugepages () { } use_configserver_if_needed () { - nvcs=$(perl $VESPA_HOME/libexec/vespa/vespa-config.pl -allconfigsources) + nvcs=$($VESPA_HOME/bin/vespa-print-default configsources) x="$VESPA_CONFIG_SOURCES" if [ "$x" ]; then export VESPA_CONFIG_SOURCES="$x,$nvcs" |