aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-08 18:09:28 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-08 18:09:28 +0000
commit7527d94b7d9904bde12cebfe4775699605f4e1e1 (patch)
tree5c47768e4f0b2ab28a6604f36ee6d42611f2c9f6 /contrib
parentb403605f827754cb4e4bdd655b7f2e2405f41696 (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.2@251311 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/init.d/rc.debian.asterisk2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk
index f88f60e0c..e77576ed2 100755
--- a/contrib/init.d/rc.debian.asterisk
+++ b/contrib/init.d/rc.debian.asterisk
@@ -82,7 +82,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