[Pkg-utopia-commits] r3476 - in /packages/unstable/hal/debian: changelog hal.postinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jan 28 00:16:57 2010
New Revision: 3476

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3476
Log:
Don't accidentally start hal when being triggered.

When being triggered to regenerate the hal fdi-cache, only restart
hal if it is actually running.

Modified:
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/hal.postinst

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=3476&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Thu Jan 28 00:16:57 2010
@@ -12,6 +12,8 @@
       before trying to start the new one. The pid file can be missing or
       outdated and trying to start hal will fail otherwise. (Closes: #561505)
     - Cleanup /var/run/hal and /var/lib/hal on upgrades.
+    - When being triggered to regenerate the hal fdi-cache, only restart hal
+      if it is actually running.
   * debian/hal.dirs
     - Remove /var/lib/hal directory, it is no longer used.
 

Modified: packages/unstable/hal/debian/hal.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.postinst?rev=3476&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.postinst (original)
+++ packages/unstable/hal/debian/hal.postinst Thu Jan 28 00:16:57 2010
@@ -70,7 +70,9 @@
   triggered)
     echo "Regenerating hal fdi cache ..."
     rm -f /var/cache/hald/fdi-cache
-    invoke-rc.d hal restart || true
+    if [ -e /var/run/hald/hald.pid ]; then
+      invoke-rc.d hal restart || true
+    fi
     exit 0
   ;;
   *)