[asterisk-commits] kmoore: trunk r349535 - in /trunk: ./ contrib/init.d/rc.debian.asterisk

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed Jan  4 14:24:25 2012
New Revision: 349535

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=349535
Log:
Make debian init script conform to the LSB standard

Previously, this init script would return 1 if Asterisk was already running.
This is incorrect behavior according to the LSB standard and has been fixed by
returning 0 instead.

(closes issue ASTERISK-17958)
Reported-by: johnc
........

Merged revisions 349529 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 349532 from http://svn.asterisk.org/svn/asterisk/branches/10

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

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

Modified: trunk/contrib/init.d/rc.debian.asterisk
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/init.d/rc.debian.asterisk?view=diff&rev=349535&r1=349534&r2=349535
==============================================================================
--- trunk/contrib/init.d/rc.debian.asterisk (original)
+++ trunk/contrib/init.d/rc.debian.asterisk Wed Jan  4 14:24:25 2012
@@ -69,7 +69,7 @@
 	VERSION=`${DAEMON} -rx 'core show version' || ${TRUE}`
 	if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
 		echo "Asterisk is already running.  $0 will exit now."
-		exit 1
+		exit 0
 	fi
 
 	log_begin_msg "Starting $DESC: $NAME"