updated

svn-id: @1068

diff --git a/dumb.sh b/dumb.sh
index de64153fdd89ebab7900349c2d576da2f12168a6..6e5fc629aa415b6593d494c809f7a92cb80bc7e4 100644 (file)
--- a/dumb.sh
+++ b/dumb.sh
@@ -77,7 +77,6 @@ nls "OpenLDAP Update Replication Daemon"
 nls "Linux Infrared Remote Control mouse daemon"
 nls "multicast routing daemon"
 nls "Dynamic Route Daemon"
-
 nls "MySQL config %s does not exist"
 nls "MySQL datadir %s not configured properly"
 nls "MySQL user not configured properly"
@@ -97,6 +96,26 @@ nls "Initializing database for pks"
 nls "Initializing squid"
 nls "No SSH host key found! You must run \"%s init\" first."   "$1"
 nls "JAVA_HOME is not set! Edit /etc/sysconfig/tomcat"
+nls "Mounting NFS filesystems"
+nls "Unmounting NFS filesystems"
+nls "Configured NFS mountpoints:"
+nls "Active NFS mountpoints:"
+nls "/proc filesystem unavailable"
+nls "Registering %s"
+nls "Unregistering %s"
+nls "netsaint NSCA daemon"
+nls "Stopping MARS: stopping all connections"
+nls "Starting UPS drivers"
+nls "Stopping UPS drivers"
+nls "Reloading UPS drivers"
+nls "UPS drivers and network daemon"
+nls "UPS network daemon"
+nls "Syncing time for ntp"
+nls "Error: portmap isn't running"
+nls "netsaint NRPE daemon"
+nls "Name Switch Cache Daemon"
+nls ""
+nls ""
 nls ""
 
 fi

diff --git a/rc.d/init.d/template.init b/rc.d/init.d/template.init
index 0794186aa0b5271f0dc45b24fabcf082af17c4af..2aeff9f35be836deb7df87edabf7e4ea867b02e0 100644 (file)
--- a/rc.d/init.d/template.init
+++ b/rc.d/init.d/template.init
@@ -2,11 +2,11 @@
 #
 # <service>    <service> short service description
 #
-# chkconfig:    345  <startr_level> <stop_level>
+# chkconfig:   345 <startr_level> <stop_level>
 #
 # description: <service> long service description
 #
-# $Id: template.init,v 1.6 2001/05/15 16:54:17 baggins Exp $
+# $Id: template.init,v 1.7 2003/05/05 00:07:23 ankry Exp $
 
 
 # Source function library
@@ -51,11 +51,11 @@ case "$1" in
                msg_already_running <service>
                exit 1
        fi
-        ;;
+       ;;
   stop)
-        # Stop daemons.
-        # show "Stopping %s service" <service>
        if [ -f /var/lock/subsys/<service> ]; then
+               # Stop daemons.
+               # show "Stopping %s service" <service>
                msg_stopping <service>
                killproc <service>
                RETVAL=$?
@@ -64,18 +64,20 @@ case "$1" in
                # show "%s service is not running." <service>
                msg_not_running <service>
                exit 1
-       fi      
-        ;;
+       fi
+       ;;
   restart)
-        $0 stop
+       $0 stop
        $0 start
-        ;;
+       ;;
   reload)
        if [ -f /var/lock/subsys/<service> ]; then
                # show "Reload %s service" <service>
                msg_reloading <service>
+               busy
                killproc <service> -HUP
                RETVAL=$?
+               [ $RETVAL -eq 0 ] && ok || died
        else
                # show "%s service is not running." <service>
                msg_not_running <service>
@@ -83,7 +85,7 @@ case "$1" in
        fi
        ;;
   force-reload)
-       # if program allows reloading without stopping
+       # if program allows reloading without stopping
        $0 reload
 
        # or if it doesn't
@@ -92,11 +94,11 @@ case "$1" in
   status)
        status <service>
        RETVAL=$?
-        ;;
+       ;;
   *)
-        # show "Usage: %s {start|stop|status|restart|reload|force-reload}" $0
-       msg_usage "$0 {start|stop|status|restart|reload|force-reload}"
-        exit 1
+       # show "Usage: %s {start|stop|restart|reload|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       exit 1
 esac
 
 exit $RETVAL