[Pkg-utopia-commits] r3654 - in /packages/unstable/dbus/debian: changelog dbus.postinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Jul 17 12:28:51 2010
New Revision: 3654

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3654
Log:
* debian/dbus.postinst
  - Stop restarting dbus system bus on upgrades as it breaks too many
    applications and is not supported by upstream in a sensible way.
    Instead trigger a reboot-required message using update-notifier.
    (Closes: #530000, #573386)

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

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=3654&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Sat Jul 17 12:28:51 2010
@@ -20,6 +20,11 @@
     - Stop restarting dependent services. It was an ugly hack anyway and if
       people want to restart dbus, they need take care of that themselves.
       (Closes: #540693, #530395)
+  * debian/dbus.postinst
+    - Stop restarting dbus system bus on upgrades as it breaks too many
+      applications and is not supported by upstream in a sensible way.
+      Instead trigger a reboot-required message using update-notifier.
+      (Closes: #530000, #573386)
 
  -- Michael Biebl <biebl at debian.org>  Thu, 15 Jul 2010 01:10:46 +0200
 

Modified: packages/unstable/dbus/debian/dbus.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.postinst?rev=3654&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.postinst (original)
+++ packages/unstable/dbus/debian/dbus.postinst Sat Jul 17 12:28:51 2010
@@ -37,9 +37,21 @@
 fi
 
 if [ "$1" = configure ] && [ -n "$2" ] && [ -x "/etc/init.d/dbus" ]; then
-    # Restart dbus on upgrades.
-    # dh_installinit -r creates the necessary start action.
-    invoke-rc.d dbus stop || true
+    # Do not restart dbus on upgrades, only on fresh installations.
+    # (dh_installinit -r creates a start action)
+    # But do reload it so the machine-id can be generated
+    if /etc/init.d/dbus status > /dev/null; then
+        # trigger an update notification which recommends to reboot
+        [ -x /usr/share/update-notifier/notify-reboot-required ] && \
+            /usr/share/update-notifier/notify-reboot-required || true
+        if [ -x "/etc/init.d/dbus" ]; then
+            if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+                invoke-rc.d dbus reload || true
+            else
+                /etc/init.d/dbus reload || true
+            fi
+        fi
+    fi
 fi
 
 #DEBHELPER#