mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-06 12:36:58 +00:00
Build safe_asterisk script substituting the proper path in (bug #4952, patch not used)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
2
Makefile
2
Makefile
@@ -598,7 +598,7 @@ bininstall: all
|
|||||||
install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
|
install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
|
||||||
install -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
|
install -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
|
||||||
if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
|
if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
|
||||||
install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
|
cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
|
||||||
fi
|
fi
|
||||||
for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
|
for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
|
||||||
install -d $(DESTDIR)$(ASTHEADERDIR)
|
install -d $(DESTDIR)$(ASTHEADERDIR)
|
||||||
|
@@ -5,6 +5,7 @@ CONSOLE=yes # Whether or not you want a console
|
|||||||
#NOTIFY=ben@alkaloid.net # Who to notify about crashes
|
#NOTIFY=ben@alkaloid.net # Who to notify about crashes
|
||||||
MACHINE=`hostname` # To specify which machine has crashed when getting the mail
|
MACHINE=`hostname` # To specify which machine has crashed when getting the mail
|
||||||
DUMPDROP=/tmp
|
DUMPDROP=/tmp
|
||||||
|
ASTSBINDIR=__ASTERISK_SBIN_DIR__
|
||||||
#
|
#
|
||||||
# Don't fork when running "safely"
|
# Don't fork when running "safely"
|
||||||
#
|
#
|
||||||
@@ -44,10 +45,10 @@ run_asterisk()
|
|||||||
if [ "$TTY" != "" ]; then
|
if [ "$TTY" != "" ]; then
|
||||||
cd /tmp
|
cd /tmp
|
||||||
stty sane < /dev/${TTY}
|
stty sane < /dev/${TTY}
|
||||||
asterisk ${CLIARGS} ${ASTARGS} >& /dev/${TTY} < /dev/${TTY}
|
${ASTSBINDIR}/asterisk ${CLIARGS} ${ASTARGS} >& /dev/${TTY} < /dev/${TTY}
|
||||||
else
|
else
|
||||||
cd /tmp
|
cd /tmp
|
||||||
asterisk ${CLIARGS} ${ASTARGS}
|
${ASTSBINDIR}/asterisk ${CLIARGS} ${ASTARGS}
|
||||||
fi
|
fi
|
||||||
EXITSTATUS=$?
|
EXITSTATUS=$?
|
||||||
echo "Asterisk ended with exit status $EXITSTATUS"
|
echo "Asterisk ended with exit status $EXITSTATUS"
|
||||||
|
Reference in New Issue
Block a user