[Pkg-voip-commits] [asterisk] 01/04: init script: kill with PID (Closes: #742783)

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository asterisk.

commit 638bf4d37b827c08b786386e58364ea15d3c4989
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Tue Dec 23 07:06:38 2014 +0200

    init script: kill with PID (Closes: #742783)
    
    * Use --pidfile when killing asterisk with start-stop-daemon,
      thus not killing any other asterisk on the system.
    * Don't kill astcanary - it's asterisk's job and there's no pidfile for
      it.
    * Don't try kill -9: this is only needed for cases such as asterisk is
      run manually and then suspended.
---
 debian/asterisk.init | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/asterisk.init b/debian/asterisk.init
index 1462e21..0ab18a7 100644
--- a/debian/asterisk.init
+++ b/debian/asterisk.init
@@ -178,10 +178,7 @@ case "$1" in
 				  --pidfile $ASTSAFE_PIDFILE
 		rm -f $ASTSAFE_PIDFILE
 	fi
-	# just making sure it's really, really dead. 
-	# KILL is necessary just in case there's an asterisk -r in the background
-	start-stop-daemon --stop --quiet --oknodo --retry=0/2/TERM/2/KILL/5 --exec $DAEMON
-	start-stop-daemon --stop --quiet --oknodo --retry=0/2/TERM/2/KILL/5 --exec $CANARY
+	start-stop-daemon --stop --quiet --oknodo --exec $DAEMON --pidfile=$PIDFILE
 	echo "."
 	;;
   reload)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git