diff options
author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-08 18:09:56 +0000 |
---|---|---|
committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-08 18:09:56 +0000 |
commit | 0667880a39eb8fa62454d0a45cf6e8ffb96fc2e0 (patch) | |
tree | 55c006365f48639b4bd9523fbc5f9fe652ea5c23 /contrib | |
parent | c4676f512bc38163be8d66f644d216632457f5c1 (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@251312 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/init.d/rc.debian.asterisk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk index 5b85b076f..81c95a5fe 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 |