kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 307535 via svnmerge from

Browse Source 
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/branches/1.8@307536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2011-02-10 22:39:30 +00:00
parent aa41d4f640
commit 0962153fea
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/init.d/rc.debian.asterisk
View File

@@ -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