Merge branch 'pr/11338'

distribution/src/main/packaging/env/elasticsearch

@@ -5,6 +5,9 @@
 # Elasticsearch home directory
 #ES_HOME=/usr/share/elasticsearch
 
+# Elasticsearch Java path
+#JAVA_HOME=
+
 # Elasticsearch configuration directory
 #CONF_DIR=${path.conf}
 

docs/reference/setup/install/sysconfig-file.asciidoc

@@ -7,6 +7,10 @@
 
   The group to run as, defaults to `elasticsearch`.
 
+`JAVA_HOME`::
+
+  Set a custom Java path to be used.
+
 `ES_HEAP_SIZE`::
 
   The heap size to start with.