- up to 4.66

[packages/exim.git] / exim.init

diff --git a/exim.init b/exim.init
index a4c770bc0917df50804fc83c760e5a5693996113..03c1735da3afa22fbf053b58eb1de03471fbff7f 100644 (file)
--- a/exim.init
+++ b/exim.init
@@ -7,7 +7,7 @@
 #              that moves mail from one machine to another.
 # processname: exim
 # config:      /etc/exim.cf
-# pidfile:     /var/run/exim.pid
+# pidfile:     /var/spool/exim/exim-daemon.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -24,7 +24,7 @@ fi
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                msg_network_down Exim
                exit 1
        fi
@@ -42,6 +42,13 @@ case "$1" in
                daemon exim \
                        $( is_yes "$ALLOW_TCP_CONNECTIONS" && echo -bd ) \
                        $( [ -n "$QUEUE" ] && echo -q$QUEUE )
+               for CONFIG in $EXIM_EXTRA_CONFIGS; do
+                               msg_starting "Exim ($CONFIG)"
+                               daemon exim \
+                                       $( is_yes "$ALLOW_TCP_CONNECTIONS" && echo -bd ) \
+                                       $( [ -n "$QUEUE" ] && echo -q$QUEUE ) \
+                                       -C $CONFIG
+               done
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/exim
        else
@@ -52,11 +59,11 @@ case "$1" in
        # Stop daemons.
        if [ -f /var/lock/subsys/exim ]; then
                msg_stopping Exim
-               killproc exim
+               killproc --pidfile /var/spool/exim/exim-daemon.pid exim
                rm -f /var/lock/subsys/exim >/dev/null 2>&1
        else
                msg_not_running Exim
-       fi      
+       fi
        ;;
   restart)
        $0 stop
@@ -73,7 +80,7 @@ case "$1" in
                killproc exim -HUP
                RETVAL=$?
        else
-               msg_not_running Exim >&2
+               msg_not_running Exim
                exit 7
        fi
        ;;