diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-10 22:39:30 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-10 22:39:30 +0000 |
| commit | 1596ff53f8322aa9adf8cc4994ef76461659382a (patch) | |
| tree | fab5325fea26f3e453d762c686bf2aa2e5655421 /contrib | |
| parent | 9d557bdb71d647f5e1ffca0cb4e68bb6eb36c3f9 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.8@307536 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/init.d/rc.debian.asterisk | 2 |
1 files changed, 1 insertions, 1 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 |