kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 269346 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r269346 | pabelanger | 2010-06-09 13:32:52 -0400 (Wed, 09 Jun 2010) | 19 lines
  
  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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@269347 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Belanger
2010-06-09 17:34:38 +00:00
parent a68ca47ae2
commit 379d6cd25a
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/init.d/rc.debian.asterisk
View File

@@ -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)

16
main/term.c
View File

@@ -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>
*
@@ -87,10 +87,19 @@ 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++) {
if (termpath[i] == NULL) {
@@ -146,6 +155,7 @@ int ast_term_init(void)
}
}
end:
if (vt100compat) {
/* Make commands show up in nice colors */
if (ast_opt_light_background) {