diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-30 21:22:38 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-30 21:22:38 +0000 |
| commit | e6d65d23a7bf328eae091818fd3c3ff18d672abb (patch) | |
| tree | a7207374f081cb26ede7206a04cc87d2d52c855b /contrib/init.d | |
| parent | 5dcfa0427f6ab7145a590cd2d0db29a84a04ae06 (diff) | |
Comment out LD_ASSUME_KERNEL by default.
Print error messages if asterisk executable or the asterisk configuration
directory is not found. (issue #5785, #5708)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7241 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib/init.d')
| -rw-r--r-- | contrib/init.d/rc.debian.asterisk | 21 | ||||
| -rw-r--r-- | contrib/init.d/rc.redhat.asterisk | 22 |
2 files changed, 34 insertions, 9 deletions
diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk index 168197d56..16e7706fd 100644 --- a/contrib/init.d/rc.debian.asterisk +++ b/contrib/init.d/rc.debian.asterisk @@ -1,8 +1,13 @@ #! /bin/sh -# $Id: asterisk,v 1.2 2004/07/18 20:24:07 Gregory Boehnlein <damin@nacs.net> +# $Id: asterisk,v 1.3 2005/11/17 22:30:01 Gregory Boehnlein <damin@nacs.net> # # asterisk start the asterisk PBX # +# Thu Nov 17 2005 Gregory Boehnlein <damin@nacs.net> +# - Updated Version to 1.3 +# - Reversed behavior of LD_ASSUME_KERNEL=2.4.1 +# - Added detailed failure messages +# # Sun Jul 18 2004 Gregory Boehnlein <damin@nacs.net> # - Updated Version to 1.2 # - Added test for safe_asterisk @@ -19,8 +24,8 @@ DAEMON=/usr/sbin/asterisk # Full path to safe_asterisk script SAFE_ASTERISK=/usr/sbin/safe_asterisk -# Leave this set unless you know what you are doing. -export LD_ASSUME_KERNEL=2.4.1 +# Uncomment this ONLY if you know what you are doing. +# export LD_ASSUME_KERNEL=2.4.1 # Uncomment the following and set them to the user/groups that you # want to run Asterisk as. NOTE: this requires substantial work to @@ -30,7 +35,15 @@ export LD_ASSUME_KERNEL=2.4.1 #AST_USER="asterisk" #AST_GROUP="asterisk" -test -x $DAEMON || exit 0 +if ! [ -x $DAEMON ] ; then + echo "ERROR: /usr/sbin/asterisk not found" + exit 0 +fi + +if ! [ -d /etc/asterisk ] ; then + echo "ERROR: /etc/asterisk directory not found" + exit 0 +fi set -e diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk index ea9f22eff..1ef812463 100644 --- a/contrib/init.d/rc.redhat.asterisk +++ b/contrib/init.d/rc.redhat.asterisk @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: asterisk,v 1.2 2004/07/18 20:24:07 Gregory Boehnlein <damin@nacs.net> +# $Id: asterisk,v 1.3 2005/11/17 22:30:01 Gregory Boehnlein <damin@nacs.net> # # asterisk Starts, Stops and Reloads Asterisk. # @@ -8,6 +8,11 @@ # processname: asterisk # pidfile: /var/run/asterisk.pid # +# Thu Nov 17 2005 Gregory Boehnlein <damin@nacs.net> +# - Updated Version to 1.3 +# - Reversed behavior of LD_ASSUME_KERNEL=2.4.1 +# - Added detailed failure messages +# # Sun Jul 18 2004 Gregory Boehnlein <damin@nacs.net> # - Updated Version to 1.2 # - Added test for safe_asterisk @@ -18,11 +23,18 @@ # Source function library. . /etc/rc.d/init.d/functions -[ -x /usr/sbin/asterisk ] || exit 0 -[ -d /etc/asterisk ] || exit 0 +if ! [ -x /usr/sbin/asterisk ] ; then + echo "ERROR: /usr/sbin/asterisk not found" + exit 0 +fi + +if ! [ -d /etc/asterisk ] ; then + echo "ERROR: /etc/asterisk directory not found" + exit 0 +fi -# Leave this set unless you know what you are doing. -export LD_ASSUME_KERNEL=2.4.1 +# Uncomment this ONLY if you know what you are doing. +# export LD_ASSUME_KERNEL=2.4.1 # Full path to asterisk binary DAEMON=/usr/sbin/asterisk |