aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-02 17:14:20 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-02 17:14:20 +0000
commit24a6b99021077217f845696bc2d8bf2bdf40f913 (patch)
tree5f51f820cd77abf3cffb1ca01469cd580d1006fb /contrib
parent6e400faecdad41612c17ca4fde52f5c2399e62d9 (diff)
Don't allow two separate instances of safe_asterisk when restarting from the init script.
(closes issue #14562) Reported by: davidw Patches: Initially 20091022__issue14562.diff.txt uploaded by tilghman (license 14) Modified to 20091030__Issue14562_diff.txt uploaded by davidw (license 780) Tested by: davidw git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@226811 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/init.d/rc.redhat.asterisk8
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
index d2a630ea4..f2ebc3674 100755
--- a/contrib/init.d/rc.redhat.asterisk
+++ b/contrib/init.d/rc.redhat.asterisk
@@ -99,8 +99,14 @@ start() {
stop() {
# Stop daemons.
+ if [ -f $SAFE_ASTERISK ]; then
+ # Kill safe_asterisk first, to prevent us from starting up 2 instances of safe_asterisk
+ echo -n $"Stopping safe_asterisk: "
+ killproc `basename $SAFE_ASTERISK`
+ echo
+ fi
echo -n $"Shutting down asterisk: "
- killproc asterisk
+ killproc `basename $DAEMON`
RETVAL=$?
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk
echo