diff options
| author | Jason Parker <jparker@digium.com> | 2011-02-10 22:43:51 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2011-02-10 22:43:51 +0000 |
| commit | 96cbd4ffcde2dba25d5e243100ed529dc320b5af (patch) | |
| tree | 33eb9067fb3e02230932d05a2847a4f6c9b91e38 | |
| parent | 4cba13eb60ac976e545df8715183a44f911e712d (diff) | |
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
| -rwxr-xr-x | contrib/init.d/rc.debian.asterisk | 2 | ||||
| -rw-r--r-- | 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 69d6c171b..3d06f9556 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 7f8b6a285..ad8b38103 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 '?': |