- updated

Changed files:
    exim.init -> 1.8
    exim.sysconfig -> 1.2

diff --git a/exim.init b/exim.init
index b9f81bdd2a07a35a66a1dfca3177220188321fc2..d44122fd031138a51fe32c8e8e2c2f58082c796f 100644 (file)
--- a/exim.init
+++ b/exim.init
@@ -19,7 +19,6 @@
 if [ -f /etc/sysconfig/exim ] ; then
        . /etc/sysconfig/exim
 else
-       DAEMON=yes
        QUEUE=1h
 fi
 
@@ -29,22 +28,29 @@ if is_no "${NETWORKING}"; then
        exit 1
 fi
 
-[ -x /usr/bin/exim ] || exit 0
-
 # See how we were called.
 case "$1" in
   start)
        # Start daemons.
-       msg_starting exim
-       daemon /usr/bin/exim $([ "$DAEMON" = "yes" ] && echo -bd) \
-                                  $([ -n "$QUEUE" ] && echo -q$QUEUE)
-       touch /var/lock/subsys/exim
+       if [ ! -f /var/lock/subsys/exim ]; then
+               msg_starting Exim
+               daemon exim -bd $([ -n "$QUEUE" ] && echo -q$QUEUE)
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/exim
+       else
+               msg_Already_Running Exim
+       fi
        ;;
   stop)
        # Stop daemons.
-       msg_stopping exim
-       killproc exim
-       rm -f /var/lock/subsys/exim
+       if [ -f /var/lock/subsys/exim ]; then
+               msg_stopping Exim
+               killproc exim
+               rm -f /var/lock/subsys/exim >/dev/null 2>&1
+       else
+               msg_Not_Running Exim
+               exit 1
+       fi      
        ;;
   restart)
        $0 stop
@@ -58,5 +64,5 @@ case "$1" in
        exit 1
 esac
 
-exit 0
+exit $RETVAL
 

diff --git a/exim.sysconfig b/exim.sysconfig
index 293b9e7df681bc0631fd916f14beb683a8f9a252..48dff48bc5e343bd5922f55c525dc32e98104802 100644 (file)
--- a/exim.sysconfig
+++ b/exim.sysconfig
@@ -1,5 +1,7 @@
-# yes|no
-DAEMON=yes
+# Customized setings for exim
+
+# Nice level for exim
+SERVICE_RUN_NICE_LEVEL="+5"
 
 # queue time
 QUEUE=1h