[svn-commits] tilghman: branch 1.6.0 r236435 - in /branches/1.6.0: ./ contrib/init.d/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sun Dec 27 12:22:12 2009
New Revision: 236435

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=236435
Log:
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.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/contrib/init.d/rc.debian.asterisk

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/contrib/init.d/rc.debian.asterisk
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/contrib/init.d/rc.debian.asterisk?view=diff&rev=236435&r1=236434&r2=236435
==============================================================================
--- branches/1.6.0/contrib/init.d/rc.debian.asterisk (original)
+++ branches/1.6.0/contrib/init.d/rc.debian.asterisk Sun Dec 27 12:22:12 2009
@@ -35,6 +35,10 @@
 #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 @@
                 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)