diff options
| author | Herve Quiroz <hq@FreeBSD.org> | 2005-09-14 12:30:23 +0000 |
|---|---|---|
| committer | Herve Quiroz <hq@FreeBSD.org> | 2005-09-14 12:30:23 +0000 |
| commit | d1f2d08b33c0777801e4e4ef7339d92723a3c12d (patch) | |
| tree | 7056949f297dfcf0d4dbe0b2cac3c5babe4e4e85 /www | |
| parent | Fix a coredump in the undo processing when doing a rotate editing (diff) | |
Run 'load_rc_config' command earlier in the rcNG launcher script
PR: 86032
Submitted by: Julio C. Perera R. <jcperera@azul.gl>
Notes
Notes:
svn path=/head/; revision=142705
Diffstat (limited to 'www')
| -rw-r--r-- | www/jakarta-tomcat55/files/tomcat.sh.in | 3 | ||||
| -rw-r--r-- | www/tomcat55/files/tomcat.sh.in | 3 | ||||
| -rw-r--r-- | www/tomcat6/files/tomcat.sh.in | 3 | ||||
| -rw-r--r-- | www/tomcat7/files/tomcat.sh.in | 3 |
4 files changed, 8 insertions, 4 deletions
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" |