From: Tilghman Lesher Date: Sun, 30 May 2010 04:45:25 +0000 (+0000) Subject: Merged revisions 266438 via svnmerge from X-Git-Tag: 1.6.2.9-rc1~2^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=218ec57d432818d881565df5588ef3048932130f;p=thirdparty%2Fasterisk.git Merged revisions 266438 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r266438 | tilghman | 2010-05-29 23:44:28 -0500 (Sat, 29 May 2010) | 9 lines Merged revisions 266437 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r266437 | tilghman | 2010-05-29 23:43:28 -0500 (Sat, 29 May 2010) | 2 lines Reverting patch and reopening issue #16784, as patch breaks color display. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@266439 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk index e77576ed28..f88f60e0cc 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 + start-stop-daemon --start --oknodo --background --exec $DAEMON -- $ASTARGS -c else start-stop-daemon --start --oknodo --exec $DAEMON -- $ASTARGS fi