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

diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk
index 69d6c171bc8b78e88e4ec340cc1a27571f0f02a3..3d06f9556bd7c9585e880e5e16bdd87995570369 100755 (executable)
--- 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 7f8b6a285aa7f2407b99089cff474afb41ec3c25..ad8b38103d89a1b919629a067a010b45f945e150 100644 (file)
--- 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 '?':