[svn-commits] russell: trunk r115546 - in /trunk: ./ contrib/init.d/rc.debian.asterisk

Thu May 8 09:41:12 CDT 2008

Author: russell
Date: Thu May  8 09:41:12 2008
New Revision: 115546

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115546
Log:
Merged revisions 115545 via svnmerge from 
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

........

Modified:
    trunk/   (props changed)
    trunk/contrib/init.d/rc.debian.asterisk

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/contrib/init.d/rc.debian.asterisk
URL: http://svn.digium.com/view/asterisk/trunk/contrib/init.d/rc.debian.asterisk?view=diff&rev=115546&r1=115545&r2=115546
==============================================================================

--- trunk/contrib/init.d/rc.debian.asterisk (original)
+++ trunk/contrib/init.d/rc.debian.asterisk Thu May  8 09:41:12 2008
@@ -53,7 +53,7 @@
   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


