SLIDER-550 custom JVM ops lose slider conf dir: bin/slider
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1e51d6db Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1e51d6db Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1e51d6db Branch: refs/heads/develop Commit: 1e51d6db6132c3a21b3ee64dcfba07025a383908 Parents: 86639d2 Author: Steve Loughran <[email protected]> Authored: Wed Oct 22 10:36:32 2014 +0100 Committer: Steve Loughran <[email protected]> Committed: Wed Oct 22 10:36:32 2014 +0100 ---------------------------------------------------------------------- slider-assembly/src/main/scripts/slider | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1e51d6db/slider-assembly/src/main/scripts/slider ---------------------------------------------------------------------- diff --git a/slider-assembly/src/main/scripts/slider b/slider-assembly/src/main/scripts/slider index 787016a..4228843 100755 --- a/slider-assembly/src/main/scripts/slider +++ b/slider-assembly/src/main/scripts/slider @@ -55,7 +55,8 @@ if [ -f "${confdir}/slider-env.sh" ]; then . "${confdir}/slider-env.sh" fi -slider_jvm_opts="-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m -Dslider.confdir=${confdir}" +slider_confdir_opts="-Dslider.confdir=${confdir}" +slider_jvm_opts="-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m" slider_jvm_opts=${SLIDER_JVM_OPTS:-$slider_jvm_opts} # allow for an extra classpath @@ -87,4 +88,4 @@ fi #echo $javabin #type ${javabin}java 2>&1 -exec ${javabin}java ${slider_jvm_opts} ${launcher} $@ +exec ${javabin}java ${slider_jvm_opts} ${slider_confdir_opts} ${launcher} $@
