Author: glen Date: Sun Apr 12 15:01:01 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- invoke catalina.sh directly
---- Files affected:
SOURCES:
apache-tomcat.init (1.12 -> 1.13)
---- Diffs:
================================================================
Index: SOURCES/apache-tomcat.init
diff -u SOURCES/apache-tomcat.init:1.12 SOURCES/apache-tomcat.init:1.13
--- SOURCES/apache-tomcat.init:1.12 Mon Jan 26 12:12:34 2009
+++ SOURCES/apache-tomcat.init Sun Apr 12 17:00:55 2009
@@ -33,7 +33,7 @@
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 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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/apache-tomcat.init?r1=1.12&r2=1.13&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
