diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2016-06-17 11:51:33 +0200 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2016-06-17 11:51:33 +0200 |
| commit | 0cf4f8e5d676320914cbe593a4d93673dd6920c9 (patch) | |
| tree | 5b276aa0c0aedece1ff936f788704711c9381834 /vespabase | |
| parent | 6d88abf17818df9e4918d51f315aa3fdc0f0af5b (diff) | |
set VESPA_USER if unset
Diffstat (limited to 'vespabase')
| -rwxr-xr-x | vespabase/src/common-env.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index cbc096dc1bf..3caa875b846 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -100,7 +100,12 @@ populate_environment () { # VESPA_USE_NO_VESPAMALLOC - list of programs that should use normal system malloc read_conf_file - consider_fallback ROOT ${VESPA_HOME} + consider_fallback ROOT ${VESPA_HOME%/} + if id yahoo >/dev/null 2>&1 ; then + consider_fallback VESPA_USER "yahoo" + elif id vespa >/dev/null 2>&1 ; then + consider_fallback VESPA_USER "vespa" + fi } populate_environment |