From d1f2d08b33c0777801e4e4ef7339d92723a3c12d Mon Sep 17 00:00:00 2001 From: Herve Quiroz Date: Wed, 14 Sep 2005 12:30:23 +0000 Subject: Run 'load_rc_config' command earlier in the rcNG launcher script PR: 86032 Submitted by: Julio C. Perera R. --- www/jakarta-tomcat55/files/tomcat.sh.in | 3 ++- www/tomcat55/files/tomcat.sh.in | 3 ++- www/tomcat6/files/tomcat.sh.in | 3 ++- www/tomcat7/files/tomcat.sh.in | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'www') diff --git a/www/jakarta-tomcat55/files/tomcat.sh.in b/www/jakarta-tomcat55/files/tomcat.sh.in index dcc46e56a21c..0dca0cb4afbf 100644 --- a/www/jakarta-tomcat55/files/tomcat.sh.in +++ b/www/jakarta-tomcat55/files/tomcat.sh.in @@ -68,6 +68,8 @@ jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log="${jakarta_tomcat%%TOMCAT_VERSION%%_ name="jakarta_tomcat%%TOMCAT_VERSION%%" rcvar=`set_rcvar` +load_rc_config "${name}" + if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then export JAVA_HOME="${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}" fi @@ -110,5 +112,4 @@ jakarta_tomcat%%TOMCAT_VERSION%%_stop() { wait_for_pids } -load_rc_config "${name}" run_rc_command "$1" diff --git a/www/tomcat55/files/tomcat.sh.in b/www/tomcat55/files/tomcat.sh.in index dcc46e56a21c..0dca0cb4afbf 100644 --- a/www/tomcat55/files/tomcat.sh.in +++ b/www/tomcat55/files/tomcat.sh.in @@ -68,6 +68,8 @@ jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log="${jakarta_tomcat%%TOMCAT_VERSION%%_ name="jakarta_tomcat%%TOMCAT_VERSION%%" rcvar=`set_rcvar` +load_rc_config "${name}" + if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then export JAVA_HOME="${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}" fi @@ -110,5 +112,4 @@ jakarta_tomcat%%TOMCAT_VERSION%%_stop() { wait_for_pids } -load_rc_config "${name}" run_rc_command "$1" diff --git a/www/tomcat6/files/tomcat.sh.in b/www/tomcat6/files/tomcat.sh.in index dcc46e56a21c..0dca0cb4afbf 100644 --- a/www/tomcat6/files/tomcat.sh.in +++ b/www/tomcat6/files/tomcat.sh.in @@ -68,6 +68,8 @@ jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log="${jakarta_tomcat%%TOMCAT_VERSION%%_ name="jakarta_tomcat%%TOMCAT_VERSION%%" rcvar=`set_rcvar` +load_rc_config "${name}" + if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then export JAVA_HOME="${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}" fi @@ -110,5 +112,4 @@ jakarta_tomcat%%TOMCAT_VERSION%%_stop() { wait_for_pids } -load_rc_config "${name}" run_rc_command "$1" diff --git a/www/tomcat7/files/tomcat.sh.in b/www/tomcat7/files/tomcat.sh.in index dcc46e56a21c..0dca0cb4afbf 100644 --- a/www/tomcat7/files/tomcat.sh.in +++ b/www/tomcat7/files/tomcat.sh.in @@ -68,6 +68,8 @@ jakarta_tomcat%%TOMCAT_VERSION%%_stderr_log="${jakarta_tomcat%%TOMCAT_VERSION%%_ name="jakarta_tomcat%%TOMCAT_VERSION%%" rcvar=`set_rcvar` +load_rc_config "${name}" + if [ -n "${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}" ] ; then export JAVA_HOME="${jakarta_tomcat%%TOMCAT_VERSION%%_java_home}" fi @@ -110,5 +112,4 @@ jakarta_tomcat%%TOMCAT_VERSION%%_stop() { wait_for_pids } -load_rc_config "${name}" run_rc_command "$1" -- cgit v1.2.3