[asterisk-commits] russell: branch 1.6.0 r115547 - in /branches/1.6.0: ./ contrib/init.d/

[SVN commits to the Asterisk project]

Author: russell
Date: Thu May  8 09:41:34 2008
New Revision: 115547

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115547
Log:
Merged revisions 115546 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r115546 | russell | 2008-05-08 09:41:12 -0500 (Thu, 08 May 2008) | 12 lines

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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/contrib/init.d/rc.debian.asterisk

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/contrib/init.d/rc.debian.asterisk
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/contrib/init.d/rc.debian.asterisk?view=diff&rev=115547&r1=115546&r2=115547
==============================================================================
--- branches/1.6.0/contrib/init.d/rc.debian.asterisk (original)
+++ branches/1.6.0/contrib/init.d/rc.debian.asterisk Thu May  8 09:41:34 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