[asterisk-commits] tilghman: trunk r105176 - in /trunk: ./ contrib/init.d/rc.debian.asterisk

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Feb 28 19:15:20 2008
New Revision: 105176

URL: http://svn.digium.com/view/asterisk?view=rev&rev=105176
Log:
Merged revisions 105113 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r105113 | tilghman | 2008-02-28 15:56:54 -0600 (Thu, 28 Feb 2008) | 7 lines

Update init script for LSB compat
(closes issue #9843)
 Reported by: ibc
 Patches: 
       rc.debian.asterisk.patch uploaded by ibc (license 211)
 Tested by: paravoid

........

Modified:
    trunk/   (props changed)
    trunk/contrib/init.d/rc.debian.asterisk

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/contrib/init.d/rc.debian.asterisk
URL: http://svn.digium.com/view/asterisk/trunk/contrib/init.d/rc.debian.asterisk?view=diff&rev=105176&r1=105175&r2=105176
==============================================================================
--- trunk/contrib/init.d/rc.debian.asterisk (original)
+++ trunk/contrib/init.d/rc.debian.asterisk Thu Feb 28 19:15:20 2008
@@ -1,15 +1,17 @@
 #! /bin/sh
 # $Id$
 #
-# asterisk	start the asterisk PBX
+# Mon Jun 04 2007 Iñaki Baz Castillo <ibc at in.ilimit.es>
+# - Eliminated SAFE_ASTERISK since it doesn't work as LSB script (it could require a independent "safe_asterisk" init script).
+# - Load and use the standar "/lib/lsb/init-functions".
+# - Addded "--oknodo" to "start-stop-daemon" for compatibility with LSB:
+#   http://www.linux-foundation.org/spec/refspecs/LSB_3.0.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
 #
 # Thu Nov 17 2005 Gregory Boehnlein <damin at 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 at nacs.net>
-# - Updated Version to 1.2
 # - Added test for safe_asterisk
 # - Changed "stop gracefully" to "stop now"
 # - Added support for -U and -G command line options
@@ -20,9 +22,6 @@
 DESC="Asterisk PBX"
 # Full path to asterisk binary
 DAEMON=/usr/sbin/asterisk
-
-# Full path to safe_asterisk script
-SAFE_ASTERISK=/usr/sbin/safe_asterisk
 
 # Uncomment this ONLY if you know what you are doing.
 # export LD_ASSUME_KERNEL=2.4.1
@@ -35,8 +34,10 @@
 #AST_USER="asterisk"
 #AST_GROUP="asterisk"
 
+set -e
+
 if ! [ -x $DAEMON ] ; then
-        echo "ERROR: /usr/sbin/asterisk not found"
+        echo "ERROR: $DAEMON not found"
         exit 0
 fi
 
@@ -45,35 +46,37 @@
         exit 0
 fi
 
-set -e
+# Use the LSB standar functions for services management
+. /lib/lsb/init-functions
 
 case "$1" in
   start)
-	echo -n "Starting $DESC: "
-	if [ -f $SAFE_ASTERISK ] ; then
-		DAEMON=$SAFE_ASTERISK
-	fi
+	log_begin_msg "Starting $DESC: $NAME"
         if [ $AST_USER ] ; then
                 ASTARGS="-U $AST_USER"
         fi
         if [ $AST_GROUP ] ; then
-                ASTARGS="`echo $ASTARGS` -G $AST_GROUP"
+                ASTARGS="$ASTARGS -G $AST_GROUP"
         fi
-	start-stop-daemon --start --exec $DAEMON -- $ASTARGS
-	echo "$NAME."
+	# "start-stop-daemon --oknodo" returns 0 even if Asterisk was already running (as LSB expects):
+	start-stop-daemon --start --oknodo --exec $DAEMON -- $ASTARGS
+	log_end_msg $?
 	;;
   stop)
-	echo -n "Stopping $DESC: "
-	$DAEMON -rx 'stop now' > /dev/null 2> /dev/null && echo -n "$NAME"
-	echo "."
-	exit 0
+	log_begin_msg "Stopping $DESC: $NAME"
+	# "start-stop-daemon --oknodo" returns 0 even if Asterisk was already stopped (as LSB expects):
+	start-stop-daemon --stop --oknodo --exec $DAEMON
+	log_end_msg $?
 	;;
   reload)
 	echo "Reloading $DESC configuration files."
 	$DAEMON -rx 'reload' > /dev/null 2> /dev/null
 	;;
   restart|force-reload)
-	$DAEMON -rx 'restart gracefully' > /dev/null 2> /dev/null && echo -n "$NAME"
+	$0 stop
+	sleep 2  # It needs some time to really be stopped.
+	$0 start
+	# "restart|force-reload" starts Asterisk and returns 0 even if Asterisk was stopped (as LSB expects).
 	;;
   *)
 	N=/etc/init.d/$NAME
@@ -81,5 +84,3 @@
 	exit 1
 	;;
 esac
-
-exit 0