diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-04 18:12:52 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-04 18:12:52 +0000 |
commit | dc76ba74df2442efe2e986ee50e13247a263ed81 (patch) | |
tree | d95357a9f252222bdd4d6363e1456765b0ef46fc /contrib | |
parent | f83be6024292b703d2d698b176213c7c211d2a63 (diff) |
Merged revisions 7285,7299,7310,7329 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7285 | tilghman | 2005-12-02 15:12:05 -0600 (Fri, 02 Dec 2005) | 2 lines
Turn on executable bits for startup scripts, and fix bash var interpolation for Mandrake
........
r7299 | oej | 2005-12-02 19:24:40 -0600 (Fri, 02 Dec 2005) | 2 lines
Documenting the default registerattempts setting as 0, continue hammering the server for ever and ever ;-)
........
r7310 | tilghman | 2005-12-03 13:55:05 -0600 (Sat, 03 Dec 2005) | 3 lines
Bug 5925: check for "Unknown", as that's what app_voicemail puts into the field for Unknown callerid
Also, remove useless res checks (initialized to 0; never set)
........
r7329 | kpfleming | 2005-12-04 12:03:07 -0600 (Sun, 04 Dec 2005) | 2 lines
use a more efficient way to get the revision number, that will also report if the working copy contains uncommitted modifications
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7330 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib')
-rwxr-xr-x[-rw-r--r--] | contrib/init.d/rc.debian.asterisk | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | contrib/init.d/rc.gentoo.asterisk | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | contrib/init.d/rc.mandrake.asterisk | 11 | ||||
-rwxr-xr-x[-rw-r--r--] | contrib/init.d/rc.mandrake.zaptel | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | contrib/init.d/rc.redhat.asterisk | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | contrib/init.d/rc.slackware.asterisk | 0 |
6 files changed, 8 insertions, 3 deletions
diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk index 16e7706fd..16e7706fd 100644..100755 --- a/contrib/init.d/rc.debian.asterisk +++ b/contrib/init.d/rc.debian.asterisk diff --git a/contrib/init.d/rc.gentoo.asterisk b/contrib/init.d/rc.gentoo.asterisk index ae7520066..ae7520066 100644..100755 --- a/contrib/init.d/rc.gentoo.asterisk +++ b/contrib/init.d/rc.gentoo.asterisk diff --git a/contrib/init.d/rc.mandrake.asterisk b/contrib/init.d/rc.mandrake.asterisk index 5452fdda7..702de53dc 100644..100755 --- a/contrib/init.d/rc.mandrake.asterisk +++ b/contrib/init.d/rc.mandrake.asterisk @@ -15,7 +15,12 @@ CONSOLE=yes # Whether or not you want a console NOTIFY=root # Who to notify about crashes DUMPDROP=/tmp HOSTNAME=`hostname` -CONFIGFILE=/etc/sysconfig/`basename $0` +if [ 0`readlink $0` = "0" ]; then + CONFIGFILE=/etc/sysconfig/`basename $0` +else + CONFIG0=`readlink $0` + CONFIGFILE=/etc/sysconfig/`basename $CONFIG0` +fi # Setup environment cd /usr/src @@ -68,7 +73,7 @@ ulimit -c unlimited #{ #} -SIGMSG=("Hangup" "Interrupt" "Quit" "Illegal instruction" "Trace trap" "IOT Trap" "Bus Error" "Floating-point exception" "Killed" "User-defined signal 1" "Segmentation violation" "User-defined signal 2" "Broken pipe" "Alarm clock" "Termination" "Stack fault") +SIGMSG=("None", "Hangup" "Interrupt" "Quit" "Illegal instruction" "Trace trap" "IOT Trap" "Bus Error" "Floating-point exception" "Killed" "User-defined signal 1" "Segmentation violation" "User-defined signal 2" "Broken pipe" "Alarm clock" "Termination" "Stack fault") run_asterisk() { @@ -90,7 +95,7 @@ run_asterisk() exit 0 elif [ $EXITSTATUS -gt 128 ]; then EXITSIGNAL=$(($EXITSTATUS - 128)) - EXITMSG=$SIGMSG[$EXITSIGNAL] + EXITMSG=${SIGMSG[$EXITSIGNAL]} echo "Asterisk exited on signal $EXITSIGNAL - $EXITMSG." if [ "$NOTIFY" != "" ]; then echo "Asterisk exited on signal $EXITSIGNAL - $EXITMSG. Might want to take a peek." | \ diff --git a/contrib/init.d/rc.mandrake.zaptel b/contrib/init.d/rc.mandrake.zaptel index c5c26000e..c5c26000e 100644..100755 --- a/contrib/init.d/rc.mandrake.zaptel +++ b/contrib/init.d/rc.mandrake.zaptel diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk index 1ef812463..1ef812463 100644..100755 --- a/contrib/init.d/rc.redhat.asterisk +++ b/contrib/init.d/rc.redhat.asterisk diff --git a/contrib/init.d/rc.slackware.asterisk b/contrib/init.d/rc.slackware.asterisk index 676345909..676345909 100644..100755 --- a/contrib/init.d/rc.slackware.asterisk +++ b/contrib/init.d/rc.slackware.asterisk |