[Pkg-utopia-commits] r286 - packages/experimental/hal/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2005-08-27 20:19:13 +0000 (Sat, 27 Aug 2005)
New Revision: 286

Modified:
   packages/experimental/hal/debian/changelog
   packages/experimental/hal/debian/hal.postinst
Log:
Only restart dbus if hal isn't already running

Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2005-08-27 15:56:36 UTC (rev 285)
+++ packages/experimental/hal/debian/changelog	2005-08-27 20:19:13 UTC (rev 286)
@@ -14,8 +14,10 @@
         thing.
       - Enable storage.requires_eject on USB storage devices to always
         eject them (which causes them to properly power off).
+    + Only (re)start dbus when hal isn't already running.
+  
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 27 Aug 2005 17:55:22 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 27 Aug 2005 22:17:50 +0200
 
 hal (0.5.2-1) experimental; urgency=low
 

Modified: packages/experimental/hal/debian/hal.postinst
===================================================================
--- packages/experimental/hal/debian/hal.postinst	2005-08-27 15:56:36 UTC (rev 285)
+++ packages/experimental/hal/debian/hal.postinst	2005-08-27 20:19:13 UTC (rev 286)
@@ -39,10 +39,15 @@
       mv /etc/init.d/hal /etc/dbus-1/event.d/
       update-rc.d hal remove
     fi
+ 
+    # only start dbus/hal if it is not already running
+    if [ ! -e /var/run/hal/hald.pid ] || ! ps --no-headers -p $(< /var/run/hal/hald.pid) > /dev/null ; then
+        if [ -x /etc/init.d/dbus ]; then
+            invoke-rc.d dbus restart || true
+        fi
+    fi
 
-    if [ -x /etc/init.d/dbus ]; then
-      invoke-rc.d dbus restart || true
-    fi
+
   ;;
   abort-upgrade|abort-remove|abort-deconfigure)
   ;;