Merge pull request #15173 from rhoml/enable_es_include_on_init

Enable es_include at init
2016-03-10 14:31:50 -05:00 · 2016-03-10 14:31:50 -05:00 · 48191a44ab
parent 5e5bb04e2f f759604783
commit 48191a44ab
2 changed files with 2 additions and 0 deletions
--- a/distribution/deb/src/main/packaging/init.d/elasticsearch
+++ b/distribution/deb/src/main/packaging/init.d/elasticsearch
@ -107,6 +107,7 @@ export ES_DIRECT_SIZE
 export ES_JAVA_OPTS
 export ES_GC_LOG_FILE
 export JAVA_HOME
+export ES_INCLUDE

 # Check DAEMON exists
 test -x $DAEMON || exit 0
--- a/distribution/rpm/src/main/packaging/init.d/elasticsearch
+++ b/distribution/rpm/src/main/packaging/init.d/elasticsearch
@ -66,6 +66,7 @@ export ES_JAVA_OPTS
 export ES_GC_LOG_FILE
 export ES_STARTUP_SLEEP_TIME
 export JAVA_HOME
+export ES_INCLUDE

 lockfile=/var/lock/subsys/$prog