Merged revisions 115554 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115554 | russell | 2008-05-08 10:32:08 -0500 (Thu, 08 May 2008) | 3 lines

Don't exit the script if Asterisk is not running.
(closes issue #12611)

........

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

diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk
index 6a556f2f7db4efbe46ad3e3ff80c87bfc73ef491..0d9eb6915bda17d9a81ad6d62ac41ad6b82646d4 100755 (executable)
--- a/contrib/init.d/rc.debian.asterisk
+++ b/contrib/init.d/rc.debian.asterisk
@@ -22,6 +22,7 @@ NAME=asterisk
 DESC="Asterisk PBX"
 # Full path to asterisk binary
 DAEMON=/usr/sbin/asterisk
+TRUE=/bin/true
 
 # Uncomment this ONLY if you know what you are doing.
 # export LD_ASSUME_KERNEL=2.4.1
@@ -53,7 +54,7 @@ case "$1" in
   start)
        # Check if Asterisk is already running.  If it is, then bug out, because
        # starting up Asterisk when Asterisk is already running is very bad.
-       VERSION=`${DAEMON} -rx 'core show version'`
+       VERSION=`${DAEMON} -rx 'core show version' || ${TRUE}`
        if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
                echo "Asterisk is already running.  $0 will exit now."
                exit 1