From 544ef8cb17014efb72abb2932d227e4f327b1dcb Mon Sep 17 00:00:00 2001 From: Alexander Reelsen Date: Thu, 11 Dec 2014 16:15:00 +0100 Subject: [PATCH] Packaging: Add java7/8 java-package paths to debian init script If you use the java-package tool to create java packages, those paths also should be added to the debian init script. Also updated the docs, that it is ok to install java8. Closes #7383 --- docs/reference/setup/as-a-service.asciidoc | 2 +- src/deb/init.d/elasticsearch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/setup/as-a-service.asciidoc b/docs/reference/setup/as-a-service.asciidoc index ccbb1f211fe..f3127636af7 100644 --- a/docs/reference/setup/as-a-service.asciidoc +++ b/docs/reference/setup/as-a-service.asciidoc @@ -53,7 +53,7 @@ sudo apt-get install oracle-java7-installer java -version -------------------------------------------------- -The last command should verify a successful installation of the Oracle JDK. +The last command should verify a successful installation of the Oracle JDK. If you want to install java8, you can call `apt-get install oracle-java8-installer` [float] diff --git a/src/deb/init.d/elasticsearch b/src/deb/init.d/elasticsearch index 88005e35db9..996eed75812 100755 --- a/src/deb/init.d/elasticsearch +++ b/src/deb/init.d/elasticsearch @@ -44,7 +44,7 @@ ES_USER=elasticsearch ES_GROUP=elasticsearch # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT) -JDK_DIRS="/usr/lib/jvm/jdk-7-oracle-x64 /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-amd64/ /usr/lib/jvm/java-7-openjdk-armhf /usr/lib/jvm/java-7-openjdk-i386/ /usr/lib/jvm/default-java" +JDK_DIRS="/usr/lib/jvm/java-8-oracle/ /usr/lib/jvm/j2sdk1.8-oracle/ /usr/lib/jvm/jdk-7-oracle-x64 /usr/lib/jvm/java-7-oracle /usr/lib/jvm/j2sdk1.7-oracle/ /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-amd64/ /usr/lib/jvm/java-7-openjdk-armhf /usr/lib/jvm/java-7-openjdk-i386/ /usr/lib/jvm/default-java" # Look for the right JVM to use for jdir in $JDK_DIRS; do