From f986c2b287aa7d41259fc570d30f4da7655e1bb9 Mon Sep 17 00:00:00 2001 From: Leif Madsen Date: Thu, 25 Mar 2010 17:02:17 +0000 Subject: [PATCH] Make safe_asterisk work on dash/sh/bash etc. Merged from the change to trunk via issue #13111. For some reason the changes there were only done on trunk, and thus were available for 1.6.1 and 1.6.2 when they were branched. Because this change is available on both 1.6.1 and 1.6.2, it makes sense to allow it on the 1.6.0 branch as well. (closes issue #17094) Reported by: stuarth Much thanks to Tilghman and Sean Bright for the help on this merge. Merged revisions 135061 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r135061 | mvanbaak | 2008-08-01 07:17:33 -0500 (Fri, 01 Aug 2008) | 8 lines Make safe_asterisk work on dash/sh/bash etc. (closes issue #13111) Reported by: pabelanger Patches: 2008071901_issue13111_safe_asterisk.diff uploaded by mvanbaak (license 7) Tested by: mvanbaak, pabelanger ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254539 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- contrib/scripts/safe_asterisk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk index 941f464e1a..5f4ab7c114 100644 --- a/contrib/scripts/safe_asterisk +++ b/contrib/scripts/safe_asterisk @@ -32,7 +32,7 @@ PRIORITY=0 # set to the system's maximum files open devided by two, if not set here. # MAXFILES=32768 -function message() { +message() { echo "$1" >&2 if test "x$SYSLOG" != "x" ; then logger -p "${SYSLOG}.warn" -t safe_asterisk[$$] "$1" @@ -142,7 +142,7 @@ run_asterisk() if test "x$TTY" != "x" ; then cd /tmp stty sane < /dev/${TTY} - nice -n $PRIORITY ${ASTSBINDIR}/asterisk -f ${CLIARGS} ${ASTARGS} >& /dev/${TTY} < /dev/${TTY} + nice -n $PRIORITY ${ASTSBINDIR}/asterisk -f ${CLIARGS} ${ASTARGS} > /dev/${TTY} 2>&1 < /dev/${TTY} else cd /tmp nice -n $PRIORITY ${ASTSBINDIR}/asterisk -f ${CLIARGS} ${ASTARGS}