[Pkg-voip-commits] r7720 - in /asterisk/trunk/debian: asterisk.default asterisk.init changelog

[paravoid at alioth.debian.org]

Author: paravoid
Date: Mon Oct 26 00:04:02 2009
New Revision: 7720

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7720
Log:
Multiple fixes to init script: call 'core stop now' instead of 'stop now',
kill the canary on stop, don't print the banner on start.

Modified:
    asterisk/trunk/debian/asterisk.default
    asterisk/trunk/debian/asterisk.init
    asterisk/trunk/debian/changelog

Modified: asterisk/trunk/debian/asterisk.default
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk.default?rev=7720&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk.default (original)
+++ asterisk/trunk/debian/asterisk.default Mon Oct 26 00:04:02 2009
@@ -9,7 +9,7 @@
 # AST_REALTIME: if set to anything other than "no", asterisk will run in 
 #               real-time priority (pass '-p' to asterisk). un-rem the 
 #               following line to disable asterisk from running in real-time 
-#               priority
+#               priority. The default is 'yes'.
 #AST_REALTIME=no
 #
 # PARAMS: extra parameters to pass to asterisk: generate cores in 

Modified: asterisk/trunk/debian/asterisk.init
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk.init?rev=7720&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk.init (original)
+++ asterisk/trunk/debian/asterisk.init Mon Oct 26 00:04:02 2009
@@ -27,6 +27,7 @@
 USER=$NAME
 GROUP=$USER
 DAEMON=/usr/sbin/$NAME
+CANARY=/usr/sbin/astcanary
 DESC="Asterisk PBX"
 PIDFILE="/var/run/asterisk/asterisk.pid"
 ASTSAFE_PIDFILE="/var/run/asterisk/asterisk_safe.pid"
@@ -122,7 +123,6 @@
 	# if $HOME is set, asterisk -rx writes a .asterisk_history there
 	(
 		unset HOME
-
 		$DAEMON -rx "$1"
 	)
 }
@@ -153,7 +153,7 @@
 		fi
 		start-stop-daemon --start --group $GROUP --pidfile "$PIDFILE" \
 			$CHDIR_PARM \
-			--exec $REALDAEMON -- $PARAMS
+			--exec $REALDAEMON -- $PARAMS > /dev/null
 	else
 		start-stop-daemon --start --group $GROUP \
 			--background --make-pidfile \
@@ -170,7 +170,7 @@
 	# this may hang in some cases. Specifically, when the asterisk
 	# processes is stopped. No bother to worry about cleanup: 
 	# it will either fail or die when asterisk dies.
-	( asterisk_rx 'stop now' > /dev/null 2>&1 & ) &
+	( asterisk_rx 'core stop now' > /dev/null 2>&1 & ) &
 	if [ "$RUNASTSAFE" = "yes" ];then
 		start-stop-daemon --stop --quiet --oknodo \
 				  --pidfile $ASTSAFE_PIDFILE
@@ -179,6 +179,7 @@
 	# just making sure it's really, really dead. 
 	# KILL is necessary just in case there's an asterisk -r in the background
 	start-stop-daemon --stop --quiet --oknodo --retry=0/2/TERM/2/KILL/5 --exec $DAEMON
+	start-stop-daemon --stop --quiet --oknodo --retry=0/2/TERM/2/KILL/5 --exec $CANARY
 	echo "."
 	;;
   reload)
@@ -193,7 +194,7 @@
 	asterisk_rx 'dialplan reload'
 	;;
   restart-convenient)
-	asterisk_rx 'restart when convenient'
+	asterisk_rx 'core restart when convenient'
 	;;
   restart|force-reload)
 	$0 stop

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7720&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Oct 26 00:04:02 2009
@@ -11,6 +11,8 @@
     Thanks Digium!
   * Remove patches/debian-banner, no need to warn users to use our BTS
     anymore as we don't diverge that much nowadays.
+  * Multiple fixes to init script: call 'core stop now' instead of 'stop now',
+    kill the canary on stop, don't print the banner on start.
   * Temporarily remove OSP support, Asterisk needs a new version (3.5) that
     isn't yet in Debian.
   * Add sox to Recommends, used by res_monitor.
@@ -22,7 +24,7 @@
     includes a vulnerable version of the prototype Javascript library.
   * Remove obsolete debian/backports/{etch,edgy,feisty}.
 
- -- Faidon Liambotis <paravoid at debian.org>  Mon, 26 Oct 2009 01:11:41 +0200
+ -- Faidon Liambotis <paravoid at debian.org>  Mon, 26 Oct 2009 02:03:45 +0200
 
 asterisk (1:1.6.2.0~dfsg~rc1-1) unstable; urgency=low