Merged revisions 115545 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 8 May 2008 14:41:12 +0000 (14:41 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 8 May 2008 14:41:12 +0000 (14:41 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115545 | russell | 2008-05-08 09:40:53 -0500 (Thu, 08 May 2008) | 4 lines

Use the same method for executing Asterisk as the rest of the script.
(closes issue #12611)
Reported by: b_plessis

........

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

contrib/init.d/rc.debian.asterisk

index b5b150c..6a556f2 100755 (executable)
@@ -53,7 +53,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=`${ASTSBINDIR}/asterisk -rx 'core show version'`
+       VERSION=`${DAEMON} -rx 'core show version'`
        if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
                echo "Asterisk is already running.  $0 will exit now."
                exit 1