- invoke catalina.sh directly

Changed files:
    apache-tomcat.init -> 1.13

diff --git a/apache-tomcat.init b/apache-tomcat.init
index 540f74f9823a1d02a2b94e21be38b7959bf66b33..a3b28aca5aa04e0db33324ca48e62f7b2372f0ea 100644 (file)
--- a/apache-tomcat.init
+++ b/apache-tomcat.init
@@ -33,7 +33,7 @@ start() {
        if [ ! -f /var/lock/subsys/tomcat ]; then
                msg_starting tomcat
                busy
-               su tomcat -s /bin/sh -c /usr/share/tomcat/bin/startup.sh >/dev/null 2>&1
+               su tomcat -s /bin/sh -c '/usr/share/tomcat/bin/catalina.sh start' # >/dev/null 2>&1
                [ $? -ne 0 ] && RETVAL=1
                if [ $RETVAL -eq 0 ]; then
                        ok
@@ -51,7 +51,7 @@ stop() {
                # Stop daemons.
                msg_stopping tomcat
                busy
-               su tomcat -s /bin/sh -c /usr/share/tomcat/bin/shutdown.sh >/dev/null 2>&1
+               su tomcat -s /bin/sh -c '/usr/share/tomcat/bin/catalina.sh stop' >/dev/null 2>&1
                [ $? -eq 0 ] && ok || fail
                rm -f /var/lock/subsys/tomcat
        else