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
elastic · Sep 3, 2014 · e9bf1d7 · e9bf1d7
1 parent 7d5725d
commit e9bf1d7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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