aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-27 18:22:17 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-27 18:22:17 +0000
commita2ecd8a9bdf946e375b75fb25f026b8ccbdbcd46 (patch)
tree1cb0c29c5147ae7e2af474b9bb2546d8313ce871
parent8a662fed8c0157b619c896ed4c33f2ed1a8e16be (diff)
Merged revisions 236434 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r236434 | tilghman | 2009-12-27 12:20:53 -0600 (Sun, 27 Dec 2009) | 9 lines Merged revisions 236433 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r236433 | tilghman | 2009-12-27 12:19:38 -0600 (Sun, 27 Dec 2009) | 2 lines Turn on colors in the daemon, since there's many requests for it on Ubuntu. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@236436 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xcontrib/init.d/rc.debian.asterisk11
1 files changed, 10 insertions, 1 deletions
diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk
index 2a6442852..5b85b076f 100755
--- a/contrib/init.d/rc.debian.asterisk
+++ b/contrib/init.d/rc.debian.asterisk
@@ -35,6 +35,10 @@ TRUE=/bin/true
#AST_USER="asterisk"
#AST_GROUP="asterisk"
+# If you DON'T want Asterisk to start up with terminal colors, comment
+# this out.
+COLOR=yes
+
set -e
if ! [ -x $DAEMON ] ; then
@@ -68,7 +72,12 @@ case "$1" in
ASTARGS="$ASTARGS -G $AST_GROUP"
fi
# "start-stop-daemon --oknodo" returns 0 even if Asterisk was already running (as LSB expects):
- start-stop-daemon --start --oknodo --exec $DAEMON -- $ASTARGS
+ 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
+ fi
log_end_msg $?
;;
stop)