Import Debian changes 4.92-8+deb10u3

[hcoop/debian/exim4.git] / debian / exim4-base.exim4.init

diff --git a/debian/exim4-base.exim4.init b/debian/exim4-base.exim4.init
index 8bc24e3..61f2aff 100644 (file)
--- a/debian/exim4-base.exim4.init
+++ b/debian/exim4-base.exim4.init
@@ -130,15 +130,19 @@ stop_exim()
 # we try to kill eximqr and exim SMTP listener, no matter what
 # ${QUEUERUNNER} is set to, we could have switched since starting.
   if [ -f "$QRPIDFILE" ]; then
-    killproc -p "$QRPIDFILE" "$DAEMON"
+    start-stop-daemon --stop --retry 5 --quiet --oknodo --remove-pidfile \
+      --pidfile "$QRPIDFILE" \
+      --exec "$DAEMON"
     # exim does not remove the pidfile
-    if [ $? -eq 0 ] ; then rm -f "$QRPIDFILE" ; fi
+    if [ $? -eq 2 ] ; then rm -f "$QRPIDFILE" ; fi
     log_progress_msg "exim4_queuerunner"
   fi
   if [ -f "$PIDFILE" ]; then
-    killproc -p "$PIDFILE" "$DAEMON"
+    start-stop-daemon --stop --retry 5 --quiet --oknodo --remove-pidfile \
+      --pidfile "$PIDFILE" \
+      --exec "$DAEMON"
     # exim does not remove the pidfile
-    if [ $? -eq 0 ] ; then rm -f "$PIDFILE" ; fi
+    if [ $? -eq 2 ] ; then rm -f "$PIDFILE" ; fi
     log_progress_msg "exim4_listener"
   fi
 }
@@ -147,13 +151,19 @@ reload_exim()
 {
   case ${QUEUERUNNER} in
     combined|no|ppp|queueonly)
-      killproc -p "$PIDFILE" "$DAEMON" -HUP
+      start-stop-daemon --stop --signal HUP --quiet --oknodo \
+        --pidfile "$PIDFILE" \
+        --exec "$DAEMON"
       log_progress_msg "exim4"
       ;;
     separate)
-      killproc -p "$PIDFILE" "$DAEMON" -HUP
+      start-stop-daemon --stop --signal HUP --quiet --oknodo \
+        --pidfile "$PIDFILE" \
+        --exec "$DAEMON"
       log_progress_msg "exim4_listener"
-      killproc -p "$QRPIDFILE" "$DAEMON" -HUP
+      start-stop-daemon --stop --signal HUP --quiet --oknodo \
+        --pidfile "$QRPIDFILE" \
+        --exec "$DAEMON"
       log_progress_msg "exim4_queuerunner"
       ;;
   esac