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

[paravoid at alioth.debian.org]

Author: paravoid
Date: Wed Oct 17 22:20:32 2007
New Revision: 4759

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4759
Log:
* Fix a minor issue with init script's stop target when running with
  safe_asterisk.

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

Modified: asterisk/trunk/debian/asterisk.init
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk.init?rev=4759&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk.init (original)
+++ asterisk/trunk/debian/asterisk.init Wed Oct 17 22:20:32 2007
@@ -177,21 +177,15 @@
 	;;
   stop)
 	echo -n "Stopping $DESC: $NAME"
+	# Try gracefully.
+	# 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.
+	( $DAEMON -rx 'stop now' > /dev/null 2>&1 & ) &
 	if [ "$RUNASTSAFE" = "yes" ];then
-		# hopefully this will work. Untested
-		$DAEMON -rx 'stop now' > /dev/null  || true
-		## giving a small grace time to shut down cleanly.
-		#sleep 2 # you can add timeouts in the comma
 		start-stop-daemon --stop --quiet --oknodo \
 				  --pidfile $ASTSAFE_PIDFILE
-
 		rm -f $ASTSAFE_PIDFILE
-	else
-		# Try gracefully.
-		# 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.
-		( $DAEMON -rx 'stop now' > /dev/null 2>&1 & ) &
 	fi
 	# just making sure it's really, really dead. 
 	# KILL is necessary just in case there's an asterisk -r in the background

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=4759&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Wed Oct 17 22:20:32 2007
@@ -13,10 +13,12 @@
   * Really enable the libcap/ToS functionality; the previous patch didn't
     enable the functionality, even though the code and the libcap.so
     dependency were there.
+  * Fix a minor issue with init script's stop target when running with
+    safe_asterisk.
   * Add chan_vpb, adding support for VoiceTronix OpenSwitch and OpenLine
     cards. (Closes: #396499)
 
- -- Faidon Liambotis <paravoid at debian.org>  Wed, 17 Oct 2007 20:43:23 +0300
+ -- Faidon Liambotis <paravoid at debian.org>  Thu, 18 Oct 2007 01:20:25 +0300
 
 asterisk (1:1.4.13~dfsg-1) unstable; urgency=low