[Pkg-utopia-commits] r3182 - in /packages/experimental/hal/debian: changelog hal.init

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Jul 28 03:40:23 2009
New Revision: 3182

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3182
Log:
Use s-s-d's --retry option on stop which allows us to safely remove the
ugly "sleep 1" between start and stop within restart.

Modified:
    packages/experimental/hal/debian/changelog
    packages/experimental/hal/debian/hal.init

Modified: packages/experimental/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/changelog?rev=3182&op=diff
==============================================================================
--- packages/experimental/hal/debian/changelog (original)
+++ packages/experimental/hal/debian/changelog Tue Jul 28 03:40:23 2009
@@ -26,6 +26,8 @@
   * debian/hal.init
     - Refactor safety checks into a separate function and make sure they are
       also run on restart. (Closes: #537251)
+    - Use s-s-d's --retry option on stop which allows us to safely remove the
+      ugly "sleep 1" between start and stop within restart.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 28 Jul 2009 04:34:16 +0200
 

Modified: packages/experimental/hal/debian/hal.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/hal.init?rev=3182&op=diff
==============================================================================
--- packages/experimental/hal/debian/hal.init (original)
+++ packages/experimental/hal/debian/hal.init Tue Jul 28 03:40:23 2009
@@ -42,8 +42,8 @@
 }
 
 do_stop() {
-	start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \
-		--exec $DAEMON 
+	start-stop-daemon --stop --retry 5 --oknodo --quiet --pidfile $PIDFILE \
+		--exec $DAEMON
 }
 
 check_prerequisites() {
@@ -83,7 +83,6 @@
 	check_prerequisites
 	log_daemon_msg "Restarting $DESC" "$NAME"
 	do_stop
-	sleep 1
 	do_start
 	log_end_msg $?
 	;;