[asterisk-commits] lmadsen: branch 1.6.1 r251312 - /branches/1.6.1/contrib/init.d/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Mon Mar  8 12:09:56 2010
New Revision: 251312

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

................
  r251310 | lmadsen | 2010-03-08 12:08:44 -0600 (Mon, 08 Mar 2010) | 21 lines
  
  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:
    branches/1.6.1/contrib/init.d/rc.debian.asterisk

Modified: branches/1.6.1/contrib/init.d/rc.debian.asterisk
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/contrib/init.d/rc.debian.asterisk?view=diff&rev=251312&r1=251311&r2=251312
==============================================================================
--- branches/1.6.1/contrib/init.d/rc.debian.asterisk (original)
+++ branches/1.6.1/contrib/init.d/rc.debian.asterisk Mon Mar  8 12:09:56 2010
@@ -74,7 +74,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