From 96cbd4ffcde2dba25d5e243100ed529dc320b5af Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Thu, 10 Feb 2011 22:43:51 +0000
Subject: [PATCH] Merged revisions 307536 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r307536 | qwell | 2011-02-10 16:39:30 -0600 (Thu, 10 Feb 2011) | 22 lines

  Merged revisions 307535 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r307535 | qwell | 2011-02-10 16:35:49 -0600 (Thu, 10 Feb 2011) | 15 lines

    Merged revisions 307534 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r307534 | qwell | 2011-02-10 16:33:09 -0600 (Thu, 10 Feb 2011) | 8 lines

      Remove color when executing commands via a remote console.

      Essentially this makes '-x' imply '-n' on rasterisk.  This was done in a
      different and incomplete way previously, which I'm reverting here.

      (issue #18776)
      Reported by: alecdavis
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 contrib/init.d/rc.debian.asterisk | 2 +-
 main/asterisk.c                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk
index 69d6c171bc..3d06f9556b 100755
--- a/contrib/init.d/rc.debian.asterisk
+++ b/contrib/init.d/rc.debian.asterisk
@@ -66,7 +66,7 @@ case "$1" in
   start)
 	# Check if Asterisk is already running.  If it is, then bug out, because
 	# starting up Asterisk when Asterisk is already running is very bad.
-	VERSION=`${DAEMON} -rnx 'core show version' || ${TRUE}`
+	VERSION=`${DAEMON} -rx 'core show version' || ${TRUE}`
 	if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
 		echo "Asterisk is already running.  $0 will exit now."
 		exit 1
diff --git a/main/asterisk.c b/main/asterisk.c
index 7f8b6a285a..ad8b38103d 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3321,7 +3321,7 @@ int main(int argc, char *argv[])
 			ast_clear_flag(&ast_options, AST_OPT_FLAG_FORCE_BLACK_BACKGROUND);
 			break;
 		case 'x':
-			ast_set_flag(&ast_options, AST_OPT_FLAG_EXEC);
+			ast_set_flag(&ast_options, AST_OPT_FLAG_EXEC | AST_OPT_FLAG_NO_COLOR);
 			xarg = ast_strdupa(optarg);
 			break;
 		case '?':