diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-09 17:32:52 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-09 17:32:52 +0000 |
| commit | 4dae7fef42da51388d7ba01b033f19822341ff03 (patch) | |
| tree | 9f1779c4f2a3fe00ebed0daa2b61c613167cd98f /contrib | |
| parent | 3bd233b49d32bfbdf330f025ea35c7cec7b5b145 (diff) | |
Merged revisions 269334 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r269334 | pabelanger | 2010-06-09 13:24:53 -0400 (Wed, 09 Jun 2010) | 12 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. We now handle color displays properly.
(closes issue #16784)
Reported by: pabelanger
Patches:
20100530__issue16784__2.diff.txt uploaded by tilghman (license 14)
Tested by: pabelanger, tilghman
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@269346 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/init.d/rc.debian.asterisk | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk index e16d61c33..a59431d34 100755 --- a/contrib/init.d/rc.debian.asterisk +++ b/contrib/init.d/rc.debian.asterisk @@ -50,7 +50,7 @@ if ! [ -d $ASTETCDIR ] ; then exit 0 fi -# Use the LSB standar functions for services management +# Use the LSB standard functions for services management . /lib/lsb/init-functions # Allow configuration overrides in /etc/default/asterisk @@ -76,7 +76,6 @@ case "$1" in if [ ! -d $ASTVARRUNDIR ]; then mkdir -p $ASTVARRUNDIR fi - if [ $AST_USER ] ; then ASTARGS="-U $AST_USER" chown $AST_USER $ASTVARRUNDIR @@ -108,13 +107,11 @@ case "$1" in if [ "x$TEMPRECORDINGLOCATION" = "xyes" -o "x$TMPRECORDINGLOCATION" = "xyes" ]; then ASTARGS="$ASTARGS -t" fi - # "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 - else - start-stop-daemon --start --oknodo --exec $DAEMON -- $ASTARGS + if test "x$COLOR" = "xno" ; then + ASTARGS="$ASTARGS -n" fi + # "start-stop-daemon --oknodo" returns 0 even if Asterisk was already running (as LSB expects): + start-stop-daemon --start --oknodo --exec $DAEMON -- $ASTARGS log_end_msg $? ;; stop) |