diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-08 15:33:02 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-08 15:33:02 +0000 |
| commit | 0f3f802be37dfc13dc608a7a49e5675613033eb0 (patch) | |
| tree | 5bc1e70cf50d665da96858476f8a6f9f1095ac3c /contrib | |
| parent | af77db66f108cca8d55f0fb8bfff03b589e2f47d (diff) | |
Merged revisions 115555 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r115555 | russell | 2008-05-08 10:32:48 -0500 (Thu, 08 May 2008) | 11 lines
Merged revisions 115554 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r115554 | russell | 2008-05-08 10:32:08 -0500 (Thu, 08 May 2008) | 3 lines
Don't exit the script if Asterisk is not running.
(closes issue #12611)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@115556 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/init.d/rc.debian.asterisk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk index 6a556f2f7..0d9eb6915 100755 --- a/contrib/init.d/rc.debian.asterisk +++ b/contrib/init.d/rc.debian.asterisk @@ -22,6 +22,7 @@ NAME=asterisk DESC="Asterisk PBX" # Full path to asterisk binary DAEMON=/usr/sbin/asterisk +TRUE=/bin/true # Uncomment this ONLY if you know what you are doing. # export LD_ASSUME_KERNEL=2.4.1 @@ -53,7 +54,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} -rx 'core show version'` + VERSION=`${DAEMON} -rx 'core show version' || ${TRUE}` if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t" echo "Asterisk is already running. $0 will exit now." exit 1 |