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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Jul 28 03:35:23 2009
New Revision: 3181

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3181
Log:
* debian/hal.init
  - Refactor safety checks into a separate function and make sure they are
    also run on restart. (Closes: #537251)

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=3181&op=diff
==============================================================================
--- packages/experimental/hal/debian/changelog (original)
+++ packages/experimental/hal/debian/changelog Tue Jul 28 03:35:23 2009
@@ -23,6 +23,9 @@
     - Change Build-Depends from libvolume-id-dev to libblkid-dev (>= 1.43).
     - Bump Standards-Version to 3.8.2. No further changes.
     - Wrap hal dependencies.
+  * debian/hal.init
+    - Refactor safety checks into a separate function and make sure they are
+      also run on restart. (Closes: #537251)
 
  -- 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=3181&op=diff
==============================================================================
--- packages/experimental/hal/debian/hal.init (original)
+++ packages/experimental/hal/debian/hal.init Tue Jul 28 03:35:23 2009
@@ -46,8 +46,7 @@
 		--exec $DAEMON 
 }
 
-case "$1" in
-  start)
+check_prerequisites() {
 	if [ ! -d /proc/sys/fs/inotify ] && [ `uname` = "Linux" ]; then
 		log_failure_msg "Can't start $DESC - enable inotify support in your kernel"
 		exit 0
@@ -66,7 +65,11 @@
 		log_failure_msg "Can't start $DESC - detected chrooted session"
 		exit 0
 	fi
-	
+}
+
+case "$1" in
+  start)
+	check_prerequisites
 	log_daemon_msg "Starting $DESC" "$NAME"
 	do_start
 	log_end_msg $?
@@ -77,6 +80,7 @@
 	log_end_msg $?
 	;;
   restart|force-reload)
+	check_prerequisites
 	log_daemon_msg "Restarting $DESC" "$NAME"
 	do_stop
 	sleep 1