X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=asterisk.init;h=be2dd444cc5ff8a2baf83782593f3e1d03176a1c;hb=d57ea64bba36fd281e50f3153a8d78167bbc1f62;hp=4a9bb695f93f50a974a294c3e00de595f7860cf9;hpb=2468a25fdc0d2e5bf3afb6df5e18cf1f61605e27;p=packages%2Fasterisk.git

diff --git a/asterisk.init b/asterisk.init
index 4a9bb69..be2dd44 100644
--- a/asterisk.init
+++ b/asterisk.init
@@ -64,7 +64,7 @@ start() {
 	if [ $AST_CONFIG ]; then
 		AST_ARGS="$AST_ARGS -C $AST_CONFIG"
 	fi
-	daemon /usr/sbin/asterisk $AST_ARGS $ASTERISK_OPTS
+	daemon /usr/sbin/asterisk -F $AST_ARGS $ASTERISK_OPTS
 
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/asterisk
@@ -95,8 +95,8 @@ condrestart() {
 
 reload() {
 	if [ ! -f /var/lock/subsys/asterisk ]; then
-		RETVAL=1
 		msg_not_running "Asterisk"
+		RETVAL=1
 		return
 	fi
 
@@ -111,14 +111,32 @@ reload() {
 	fi
 }
 
+ael-reload() {
+	local res
+	res=$(aelparse -n -q | grep -F Error)
+	if [ "$res" ]; then
+		echo >&2 "$res"
+		RETVAL=1
+		return
+	fi
+
+	if [ ! -f /var/lock/subsys/asterisk ]; then
+		msg_not_running "Asterisk"
+		RETVAL=1
+		return
+	fi
+
+	/usr/sbin/asterisk -rx "ael reload"
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-  	start
+	start
 	;;
   stop)
-  	stop
+	stop
 	;;
   restart)
 	stop
@@ -128,7 +146,13 @@ case "$1" in
 	condrestart 0
 	;;
   reload|force-reload)
-  	reload
+	reload
+	;;
+  dialplan-reload)
+	/usr/sbin/asterisk -rx "dialplan reload"
+	;;
+  ael-reload)
+	ael-reload
 	;;
   logger-reload)
 	/usr/sbin/asterisk -rx "logger reload"
@@ -138,7 +162,7 @@ case "$1" in
 	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|logger-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|dialplan-reload|ael-reload|logger-reload|status}"
 	exit 3
 esac