diff options
| author | Walter Doekes <walter+asterisk@wjd.nu> | 2014-06-12 07:52:59 +0000 |
|---|---|---|
| committer | Walter Doekes <walter+asterisk@wjd.nu> | 2014-06-12 07:52:59 +0000 |
| commit | 3b0ad74e1741c78afbab229cb38965280744f76d (patch) | |
| tree | 761768adedb7f595146bba5d223b4e5905ece1dd | |
| parent | 71b3c9a749b9eb910ea6e5353d3703f93709cb29 (diff) | |
safe_asterisk: Overwrite old safe_asterisk on make install.
From now on, make install will overwrite safe_asterisk with the
latest version. You need to move any local modifications to files
inside /etc/asterisk/startup.d, if you have any.
See also commits r394939 and r397938.
ASTERISK-21965 #close
Patches:
safe_asterisk.patch uploaded by jkister (License 6232, modified by me)
........
Merged revisions 415748 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@415749 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | UPGRADE.txt | 19 | ||||
| -rw-r--r-- | contrib/scripts/safe_asterisk | 9 |
3 files changed, 19 insertions, 11 deletions
@@ -569,7 +569,7 @@ main-bininstall: bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall $(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/" $(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/" - if [ ! -f "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" -a ! -f /sbin/launchd ]; then \ + if [ ! -f /sbin/launchd ]; then \ ./build_tools/install_subst contrib/scripts/safe_asterisk "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk"; \ fi $(INSTALL) -m 644 include/asterisk.h "$(DESTDIR)$(includedir)" diff --git a/UPGRADE.txt b/UPGRADE.txt index 65c7f3a75..84e2c7bbd 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -23,12 +23,6 @@ From 12 to 13: - - Changed a log message in safe_asterisk and the $NOTIFY mail subject. If - you use tools to parse either of them, update your parse functions - accordingly. The changed strings are: - - "Exited on signal $EXITSIGNAL" => "Asterisk exited on signal $EXITSIGNAL." - - "Asterisk Died" => "Asterisk on $MACHINE died (sig $EXITSIGNAL)" - - The asterisk command line -I option and the asterisk.conf internal_timing option are removed and always enabled if any timing module is loaded. @@ -195,6 +189,19 @@ Realtime Configuration: - A new set of Alembic scripts has been added for CDR tables. This will create a 'cdr' table with the default schema that Asterisk expects. +safe_asterisk: + - The safe_asterisk script was previously not installed on top of an existing + version. This caused bug-fixes in that script not to be deployed. If your + safe_asterisk script is customized, be sure to keep your changes. Custom + values for variables should be created in *.sh file(s) inside + ASTETCDIR/startup.d/. See ASTERISK-21965. + + - Changed a log message in safe_asterisk and the $NOTIFY mail subject. If + you use tools to parse either of them, update your parse functions + accordingly. The changed strings are: + - "Exited on signal $EXITSIGNAL" => "Asterisk exited on signal $EXITSIGNAL." + - "Asterisk Died" => "Asterisk on $MACHINE died (sig $EXITSIGNAL)" + Unistim: - Added 'dtmf_duration' option with changing default operation to disable receivied dtmf playback on unistim phone diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk index 8901d8a83..de24d1b28 100644 --- a/contrib/scripts/safe_asterisk +++ b/contrib/scripts/safe_asterisk @@ -1,5 +1,6 @@ #!/bin/sh +ASTETCDIR="__ASTERISK_ETC_DIR__" ASTSBINDIR="__ASTERISK_SBIN_DIR__" ASTVARRUNDIR="__ASTERISK_VARRUN_DIR__" ASTVARLOGDIR="__ASTERISK_LOG_DIR__" @@ -146,10 +147,10 @@ trap '' PIPE # Run scripts to set any environment variables or do any other system-specific setup needed # -if test -d /etc/asterisk/startup.d; then - for script in /etc/asterisk/startup.d/*.sh; do - if test -r ${script}; then - . ${script} +if test -d "${ASTETCDIR}/startup.d"; then + for script in "${ASTETCDIR}/startup.d/"*.sh; do + if test -r "${script}"; then + . "${script}" fi done fi |