[svn-commits] russell: branch 1.6.0 r115556 - in /branches/1.6.0: ./ contrib/init.d/

[SVN commits to the Digium repositories]

Author: russell
Date: Thu May  8 10:33:02 2008
New Revision: 115556

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

................
r115555 | russell | 2008-05-08 10:32:48 -0500 (Thu, 08 May 2008) | 11 lines

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)

........

................

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=115556&r1=115555&r2=115556
==============================================================================
--- branches/1.6.0/contrib/init.d/rc.debian.asterisk (original)
+++ branches/1.6.0/contrib/init.d/rc.debian.asterisk Thu May  8 10:33:02 2008
@@ -22,6 +22,7 @@
 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 @@
   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