summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@yahoo-inc.com>2017-04-05 16:29:05 +0200
committerHåkon Hallingstad <hakon@yahoo-inc.com>2017-04-05 16:29:05 +0200
commit2b00bdd38258263d3a067c173e28efbc293f481f (patch)
tree22247c8c7358fe49ffc9079557de827ebce28bfe /container-disc
parent3f59696d6a749793a828e1393cab312527390e15 (diff)
Also change start container daemon
Diffstat (limited to 'container-disc')
-rwxr-xr-xcontainer-disc/src/main/sh/vespa-start-container-daemon.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh
index ec632a9c0c4..dd79e0dd054 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -67,8 +67,8 @@ configure_memory() {
# Update jvm_heapsize only if percentage is explicitly set (default is 0).
if ((jvm_heapSizeAsPercentageOfPhysicalMemory > 0)); then
- if ((TOTAL_MEMORY_MB > 0)); then
- available="$TOTAL_MEMORY_MB"
+ if ((VESPA_TOTAL_MEMORY_MB > 0)); then
+ available="$VESPA_TOTAL_MEMORY_MB"
else
available=`free -m | grep Mem | tr -s ' ' | cut -f2 -d' '`
fi