From 4c21db0dcadb2c2bc9df4aed4576586a4b0e1a2b Mon Sep 17 00:00:00 2001 From: Renaud AUBIN Date: Fri, 1 Aug 2014 22:16:19 +0200 Subject: [PATCH] Packaging: Add default oracle jdk 7 (x64) path in debian init script On Debian amd64, oracle jdk .deb packages made using make-jpkg (from java-package) default to /usr/lib/jvm/jdk-7-oracle-x64. Closes #7312 --- src/deb/init.d/elasticsearch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deb/init.d/elasticsearch b/src/deb/init.d/elasticsearch index 6aafcb20b0b..4c479e0813f 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/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/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" # Look for the right JVM to use for jdir in $JDK_DIRS; do