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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jan 28 00:16:23 2010
New Revision: 3472

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3472
Log:
Fix upgrade failures due to changed pid file location.

* debian/hal.postinst
  - When upgrading from lenny, make sure to kill any running hald daemon
    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)

NOTE: we can't use s-s-d --pidfile here, as when dbus restart will start the
new hal binary (which has a compiled-in default pidfile location
/var/run/hald/hald.pid), the hal init script is still the old one and only
creates /var/run/hald. So no pidfile is written in that case.

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=3472&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Thu Jan 28 00:16:23 2010
@@ -6,7 +6,10 @@
     - Initialize error structure before using it to avoid segfault in
       hald-probe-input. (Closes: #562068)
       Thanks to Sebastian Andrzej Siewior for the patch.
-
+  * debian/hal.postinst
+    - When upgrading from lenny, make sure to kill any running hald daemon
+      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)
 
  -- Michael Biebl <biebl at debian.org>  Thu, 28 Jan 2010 00:19:31 +0100
 

Modified: packages/unstable/hal/debian/hal.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.postinst?rev=3472&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.postinst (original)
+++ packages/unstable/hal/debian/hal.postinst Thu Jan 28 00:16:23 2010
@@ -46,6 +46,12 @@
       usermod --home /var/run/hald haldaemon || true
     fi
 
+    if dpkg --compare-versions "$2" lt-nl "0.5.14-2"; then
+      # Kill any running hald daemon as the pid file might be missing or
+      # outdated causing failures when upgrading from lenny. See #561505
+      start-stop-daemon --stop --oknodo --quiet --exec /usr/sbin/hald
+    fi
+
     if [ -x /etc/init.d/dbus ]; then
       invoke-rc.d dbus force-reload || true
     fi