update

Changed files:
    exim.init -> 1.6

diff --git a/exim.init b/exim.init
index feb138664f17215850a3364d584de6f43ad8f9b8..9e6b9d87f7d530af77e541d1ed9af536d58d7301 100644 (file)
--- a/exim.init
+++ b/exim.init
@@ -3,57 +3,48 @@
 # exim          This shell script takes care of starting and stopping
 #               Exim.
 #
-# chkconfig:   2345 80 30
-#
-# description: Exim is a Mail Transport Agent, which is the program \
-#              that moves mail from one machine to another.
-#
-# processname: exim
-# config:      /etc/exim.cf
-# pidfile:     /var/run/exim.pid
-
-
-# Source function library
+# chkconfig: 2345 80 30
+# description: Exim is a Mail Transport Agent, which is the program \
+#              that moves mail from one machine to another.
+# processname: exim
+# config: /etc/exim.cf
+# pidfile: /var/run/exim.pid
+
+# Source function library.
 . /etc/rc.d/init.d/functions
 
-# Get network config
+# Source networking configuration.
 . /etc/sysconfig/network
 
-# Get service config
-if [ -f /etc/sysconfig/hc-cron ]; then
-       . /etc/sysconfig/hc-cron
+# Source sendmail configureation.
+if [ -f /etc/sysconfig/exim ] ; then
+       . /etc/sysconfig/exim
 else
        DAEMON=yes
        QUEUE=1h
 fi
 
 # Check that networking is up.
-if [ "${NETWORKING}" = "no" ]; then
-       echo "WARNING: Networking is down. Exim service can't be runed."
-       exit 1
-fi
+[ "${NETWORKING}" = "no" ] && exit 0
 
+[ -x /usr/bin/exim ] || exit 0
 
 # See how we were called.
 case "$1" in
   start)
-       # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/exim ]; then
-               show Starting exim
-               daemon exim $([ "$DAEMON" = yes ] && echo -bd) \
-                       $([ -n "$QUEUE" ] && echo -q$QUEUE)
-       else
-               echo "Exim already is running"
-       fi
+       # Start daemons.
+       show "Starting exim: "
+       daemon /usr/bin/exim $([ "$DAEMON" = "yes" ] && echo -bd) \
+                                  $([ -n "$QUEUE" ] && echo -q$QUEUE)
        touch /var/lock/subsys/exim
        ;;
   stop)
        # Stop daemons.
-       show Shutting down exim:
+       show "Shutting down exim: "
        killproc exim
        rm -f /var/lock/subsys/exim
        ;;
-  restart|reload)
+  restart)
        $0 stop
        $0 start
        ;;
@@ -61,7 +52,7 @@ case "$1" in
        status exim
        ;;
   *)
-       echo "Usage: $0 {start|stop|staus|restart|reload}"
+       echo "Usage: $0 {start|stop|restart|status}"
        exit 1
 esac