From: Leif Madsen <leif@leifmadsen.com>
Date: Mon, 8 Mar 2010 18:09:56 +0000 (+0000)
Subject: Merged revisions 251310 via svnmerge from
X-Git-Tag: 1.6.1.19-rc1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb9767861b834917d2b58066a28c2f1fbf1358bb;p=thirdparty%2Fasterisk.git

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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@251312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk
index 5b85b076f1..81c95a5fec 100755
--- a/contrib/init.d/rc.debian.asterisk
+++ b/contrib/init.d/rc.debian.asterisk
@@ -74,7 +74,7 @@ case "$1" in
 	# "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