summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-05-15 15:46:12 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-05-15 15:46:12 +0200
commit20c3c90753c7e160a50e122815a24059fa8c58b0 (patch)
treec7fd34e07c52f9418e31109bfc93231a9b674673 /container-disc
parent9f064d1df9fce176829e22efdd8694b1e0273cc3 (diff)
Revert "Run extension script if exists"
This reverts commit 1e7efd7ddabb9fff21c9d76a2ff764bd7b740cd1.
Diffstat (limited to 'container-disc')
-rwxr-xr-xcontainer-disc/src/main/sh/vespa-start-container-daemon.sh8
1 files changed, 0 insertions, 8 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 d76be872d63..dd79e0dd054 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -247,13 +247,6 @@ maybe_use_jsvc () {
fi
}
-maybe_run_extensions() {
- vespa_extensions_script="${VESPA_HOME}libexec/vespa/jdisc-extensions.sh"
- if [ -f "${vespa_extensions_script}" ]; then
- . "${vespa_extensions_script}"
- fi
-}
-
getconfig
configure_memory
configure_gcopts
@@ -262,7 +255,6 @@ configure_classpath
configure_numactl
configure_preload
maybe_use_jsvc
-maybe_run_extensions
exec $numactlcmd $envcmd java \
-Dconfig.id="${VESPA_CONFIG_ID}" \