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

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Mon Mar  8 12:08:44 2010
New Revision: 251310

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=251310
Log:
Merged revisions 251309 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r251309 | lmadsen | 2010-03-08 12:07:44 -0600 (Mon, 08 Mar 2010) | 13 lines
  
  Fix Debian init script to not use -c.
  When using the init script as-is currently, it could cause issues on Debian
  such as high CPU usage. This fix has worked for several people so I'm
  implementing the change.
  
  
  (closes issue #16784)
  Reported by: pabelanger
  Tested by: pabelanger, mnick, davidw, mutineer612
  
  (closes issue #16887)
  Reported by: jlpedrosa
  Tested by: jlpedrosa, mutineer612
........

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://svnview.digium.com/svn/asterisk/trunk/contrib/init.d/rc.debian.asterisk?view=diff&rev=251310&r1=251309&r2=251310
==============================================================================
--- trunk/contrib/init.d/rc.debian.asterisk (original)
+++ trunk/contrib/init.d/rc.debian.asterisk Mon Mar  8 12:08:44 2010
@@ -111,7 +111,7 @@
 	# "start-stop-daemon --oknodo" returns 0 even if Asterisk was already running (as LSB expects):
 	if test "x$COLOR" = "xyes" ; then
 		export TERM=linux
-		start-stop-daemon --start --oknodo --background --exec $DAEMON -- $ASTARGS -c
+		start-stop-daemon --start --oknodo --background --exec $DAEMON -- $ASTARGS
 	else
 		start-stop-daemon --start --oknodo --exec $DAEMON -- $ASTARGS
 	fi