From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 2 Nov 2009 17:17:03 +0000 (+0000)
Subject: Merged revisions 226812 via svnmerge from
X-Git-Tag: 1.6.1.10-rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b5b3d1fcf6550393c3afbbabd810509d9442d5;p=thirdparty%2Fasterisk.git

Merged revisions 226812 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r226812 | tilghman | 2009-11-02 11:15:31 -0600 (Mon, 02 Nov 2009) | 15 lines

  Merged revisions 226811 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r226811 | tilghman | 2009-11-02 11:14:20 -0600 (Mon, 02 Nov 2009) | 8 lines

    Don't allow two separate instances of safe_asterisk when restarting from the init script.
    (closes issue #14562)
     Reported by: davidw
     Patches:
           Initially 20091022__issue14562.diff.txt uploaded by tilghman (license 14)
           Modified to 20091030__Issue14562_diff.txt uploaded by davidw (license 780)
     Tested by: davidw
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@226814 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
index d2a630ea40..f2ebc3674d 100755
--- a/contrib/init.d/rc.redhat.asterisk
+++ b/contrib/init.d/rc.redhat.asterisk
@@ -99,8 +99,14 @@ start() {
 
 stop() {
 	# Stop daemons.
+	if [ -f $SAFE_ASTERISK ]; then
+		# Kill safe_asterisk first, to prevent us from starting up 2 instances of safe_asterisk
+		echo -n $"Stopping safe_asterisk: "
+		killproc `basename $SAFE_ASTERISK`
+		echo
+	fi
 	echo -n $"Shutting down asterisk: "
-	killproc asterisk
+	killproc `basename $DAEMON`
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk
 	echo