diff options
| author | Harald Musum <musum@verizonmedia.com> | 2022-05-06 14:38:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-06 14:38:37 +0200 |
| commit | 5101dd89c30ffa286c64bfae3206baf7f44cf202 (patch) | |
| tree | ab5c76effc44f6cfea230b188c285746d84f2286 /standalone-container | |
| parent | a1d094a22cf68b9270cc60f9cdc7a47f2ea6e9ae (diff) | |
| parent | 6e29b1f4cb837354dbae3941643f99d516a7264d (diff) | |
Merge pull request #22502 from vespa-engine/hakonhall/document-checkjava
Document checkjava
Diffstat (limited to 'standalone-container')
| -rwxr-xr-x | standalone-container/src/main/sh/standalone-container.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh index ca9507ae14b..a2304621845 100755 --- a/standalone-container/src/main/sh/standalone-container.sh +++ b/standalone-container/src/main/sh/standalone-container.sh @@ -137,6 +137,10 @@ StartCommand() { cd "$VESPA_HOME" || Fail "Cannot cd to $VESPA_HOME" fixlimits + + # If JAVA_HOME is set in the environment, the sourcing of common-env.sh + # elsewhere in this file ensures $JAVA_HOME/bin is first in PATH, so 'java' + # may be invoked w/o path. In any case, checkjava verifies bare 'java'. checkjava FixDataDirectory "$(dirname "$pidfile")" |