- remove remnants from template.init

Changed files:
    apache-tomcat.init -> 1.6
    jakarta-tomcat.init -> 1.6

diff --git a/apache-tomcat.init b/apache-tomcat.init
index 1da6e9576dbcdc5fe98c1e0dc6c86b7c42216700..b70631c659f5fab3952ba955b88aec0a53e56759 100644 (file)
--- a/apache-tomcat.init
+++ b/apache-tomcat.init
@@ -21,7 +21,6 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               # nls "ERROR: Networking is down. %s can't be run." <service>
                msg_network_down tomcat
                exit 1
        fi
@@ -35,7 +34,6 @@ case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/tomcat ]; then
-               # show "Starting %s service" tomcat
                msg_starting tomcat
                busy
                su - http -s /bin/sh -c /usr/lib/tomcat/bin/startup.sh >/dev/null 2>&1
@@ -43,21 +41,18 @@ case "$1" in
                [ $RETVAL -eq 0 ] && ok || fail
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tomcat
        else
-               # show "%s service is already running." tomcat
                msg_already_running tomcat
        fi
        ;;
   stop)
        if [ -f /var/lock/subsys/tomcat ]; then
                # Stop daemons.
-               # show "Stopping %s service" tomcat
                msg_stopping tomcat
                busy
                su - http -s /bin/sh -c /usr/lib/tomcat/bin/shutdown.sh >/dev/null 2>&1
                [ $? -eq 0 ] && ok || fail
                rm -f /var/lock/subsys/tomcat
        else
-               # show "%s service is not running." tomcat
                msg_not_running tomcat
        fi      
        ;;
@@ -71,7 +66,6 @@ case "$1" in
        RETVAL=0
        ;;
   *)
-       # show "Usage: %s {start|stop|restart|force-reload|status}"
        msg_usage "$0 {start|stop|restart|force-reload|status}"
        exit 3
 esac

diff --git a/jakarta-tomcat.init b/jakarta-tomcat.init
index 1da6e9576dbcdc5fe98c1e0dc6c86b7c42216700..b70631c659f5fab3952ba955b88aec0a53e56759 100644 (file)
--- a/jakarta-tomcat.init
+++ b/jakarta-tomcat.init
@@ -21,7 +21,6 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               # nls "ERROR: Networking is down. %s can't be run." <service>
                msg_network_down tomcat
                exit 1
        fi
@@ -35,7 +34,6 @@ case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/tomcat ]; then
-               # show "Starting %s service" tomcat
                msg_starting tomcat
                busy
                su - http -s /bin/sh -c /usr/lib/tomcat/bin/startup.sh >/dev/null 2>&1
@@ -43,21 +41,18 @@ case "$1" in
                [ $RETVAL -eq 0 ] && ok || fail
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tomcat
        else
-               # show "%s service is already running." tomcat
                msg_already_running tomcat
        fi
        ;;
   stop)
        if [ -f /var/lock/subsys/tomcat ]; then
                # Stop daemons.
-               # show "Stopping %s service" tomcat
                msg_stopping tomcat
                busy
                su - http -s /bin/sh -c /usr/lib/tomcat/bin/shutdown.sh >/dev/null 2>&1
                [ $? -eq 0 ] && ok || fail
                rm -f /var/lock/subsys/tomcat
        else
-               # show "%s service is not running." tomcat
                msg_not_running tomcat
        fi      
        ;;
@@ -71,7 +66,6 @@ case "$1" in
        RETVAL=0
        ;;
   *)
-       # show "Usage: %s {start|stop|restart|force-reload|status}"
        msg_usage "$0 {start|stop|restart|force-reload|status}"
        exit 3
 esac