honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13813 from rmuir/crazy_ubuntu 

Don't let ubuntu try to install its crazy jayatana agent.
This commit is contained in:
Robert Muir 2015-09-25 23:46:41 -04:00
parent 2f5b6eabab c0d098b233
commit e01a74d608
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
distribution/src/main/resources/bin/elasticsearch
View File

@ -113,6 +113,14 @@ if [ -z "$ES_CLASSPATH" ]; then
exit 1
fi
# don't let JAVA_TOOL_OPTIONS slip in (e.g. crazy agents in ubuntu)
# works around https://bugs.launchpad.net/ubuntu/+source/jayatana/+bug/1441487
if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then
echo "Warning: Ignoring JAVA_TOOL_OPTIONS=$JAVA_TOOL_OPTIONS"
echo "Please pass JVM parameters via JAVA_OPTS instead"
unset JAVA_TOOL_OPTIONS
fi
# Special-case path variables.
case `uname` in
CYGWIN*)

7
distribution/src/main/resources/bin/plugin
View File

@ -59,6 +59,13 @@ if [ -n "$ES_ENV_FILE" ]; then
fi
fi
# don't let JAVA_TOOL_OPTIONS slip in (e.g. crazy agents in ubuntu)
# works around https://bugs.launchpad.net/ubuntu/+source/jayatana/+bug/1441487
if [ "x$JAVA_TOOL_OPTIONS" != "x" ]; then
echo "Warning: Ignoring JAVA_TOOL_OPTIONS=$JAVA_TOOL_OPTIONS"
unset JAVA_TOOL_OPTIONS
fi
if [ -x "$JAVA_HOME/bin/java" ]; then
JAVA=$JAVA_HOME/bin/java
else