diff options
| author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-09 18:00:16 +0000 |
|---|---|---|
| committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-09 18:00:16 +0000 |
| commit | 673329fd18878ab1c8ecb45ff479e22c7862c312 (patch) | |
| tree | 205894f1bd7d3fa096c75d735001a8cefe3fd6a9 | |
| parent | 65c3f5a93329925e55d4d0bea69a48b55b23042c (diff) | |
Merge revision 269347. Update ChangeLog and .version files.
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.2.9-rc3@269351 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | .version | 2 | ||||
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rwxr-xr-x | contrib/init.d/rc.debian.asterisk | 13 | ||||
| -rw-r--r-- | main/term.c | 22 |
4 files changed, 40 insertions, 15 deletions
@@ -1 +1 @@ -1.6.2.9-rc2 +1.6.2.9-rc3 @@ -1,3 +1,21 @@ +2010-06-09 Leif Madsen <lmadsen@digium.com> + + * Asterisk 1.6.2.9-rc3 Released. + +2010-06-09 Paul Belanger <paul.belanger@polybeacon.com> + + * 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 0016784) + Reported by: pabelanger + Patches: + 20100530__issue16784__2.diff.txt uploaded by tilghman (license 14) + Tested by: pabelanger, tilghman + 2010-06-07 Leif Madsen <lmadsen@digium.com> * Asterisk 1.6.2.9-rc2 Released. diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk index f88f60e0c..c8e13ef41 100755 --- a/contrib/init.d/rc.debian.asterisk +++ b/contrib/init.d/rc.debian.asterisk @@ -53,7 +53,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 case "$1" in @@ -70,7 +70,6 @@ case "$1" in if [ ! -d $ASTVARRUNDIR ]; then mkdir -p $ASTVARRUNDIR fi - if [ $AST_USER ] ; then ASTARGS="-U $AST_USER" chown $AST_USER $ASTVARRUNDIR @@ -79,13 +78,11 @@ case "$1" in ASTARGS="$ASTARGS -G $AST_GROUP" chgrp $AST_GROUP $ASTVARRUNDIR 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) diff --git a/main/term.c b/main/term.c index 7f38ee5ce..b52fa1f26 100644 --- a/main/term.c +++ b/main/term.c @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2005, Digium, Inc. + * Copyright (C) 1999 - 2010, Digium, Inc. * * Mark Spencer <markster@digium.com> * @@ -18,9 +18,9 @@ /*! \file * - * \brief Terminal Routines + * \brief Terminal Routines * - * \author Mark Spencer <markster@digium.com> + * \author Mark Spencer <markster@digium.com> */ #include "asterisk.h" @@ -87,12 +87,21 @@ int ast_term_init(void) char buffer[512] = ""; int termfd = -1, parseokay = 0, i; - if (!term) + if (ast_opt_no_color) { return 0; - if (!ast_opt_console || ast_opt_no_color || !ast_opt_no_fork) + } + + if (!ast_opt_console) { + /* If any remote console is not compatible, we'll strip the color codes at that point */ + vt100compat = 1; + goto end; + } + + if (!term) { return 0; + } - for (i=0 ;; i++) { + for (i = 0;; i++) { if (termpath[i] == NULL) { break; } @@ -146,6 +155,7 @@ int ast_term_init(void) } } +end: if (vt100compat) { /* Make commands show up in nice colors */ if (ast_opt_light_background) { |