Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't let ubuntu try to install its crazy jayatana agent. #13813

Merged
merged 1 commit into from Sep 26, 2015
Merged

Don't let ubuntu try to install its crazy jayatana agent. #13813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions distribution/src/main/resources/bin/elasticsearch
View file
Open in desktop
Expand Up @@ -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*)
Expand Down
7 changes: 7 additions & 0 deletions distribution/src/main/resources/bin/plugin
View file
Open in desktop
Expand Up @@ -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
Expand Down