[Pkg-utopia-commits] r2159 - in /packages/unstable/networkmanager/debian: changelog network-manager.postinst network-manager.preinst rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Apr  3 00:53:19 2008
New Revision: 2159

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2159
Log:
debian/rules, debian/network-manager.postinst
- Minimize downtime during upgrades. (Closes: #432322)
Restart the service in postinst instead of stop in prerm and start in
postinst.

Modified:
    packages/unstable/networkmanager/debian/changelog
    packages/unstable/networkmanager/debian/network-manager.postinst
    packages/unstable/networkmanager/debian/network-manager.preinst
    packages/unstable/networkmanager/debian/rules

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=2159&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Thu Apr  3 00:53:19 2008
@@ -28,8 +28,12 @@
     - The pkg-config files have been fixed upstream and unnecessary
       dependencies were removed. Update Depends: for libnm-glib-dev and
       libnm-util-dev accordingly. (Closes: #469195)
-
- -- Michael Biebl <biebl at debian.org>  Thu, 03 Apr 2008 02:11:34 +0200
+  * debian/rules, debian/network-manager.postinst
+    - Minimize downtime during upgrades. (Closes: #432322)
+      Restart the service in postinst instead of stop in prerm and start in
+      postinst.
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 03 Apr 2008 02:37:16 +0200
 
 network-manager (0.6.5-5) unstable; urgency=low
 

Modified: packages/unstable/networkmanager/debian/network-manager.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.postinst?rev=2159&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.postinst (original)
+++ packages/unstable/networkmanager/debian/network-manager.postinst Thu Apr  3 00:53:19 2008
@@ -43,6 +43,18 @@
 	if [ -x "/etc/init.d/dbus" ]; then
 	    invoke-rc.d dbus force-reload || true
 	fi
+
+	# Stop the service on upgrades before it is started again.
+	# dh_installinit -r will create the start code.
+	if [ -n "$2" ]; then
+		if [ -x "/etc/init.d/network-manager" ]; then
+			invoke-rc.d network-manager stop || true
+		fi
+		if [ -x "/etc/init.d/network-manager-dispatcher" ]; then
+			invoke-rc.d network-manager-dispatcher stop || true
+		fi
+	fi
+
 	;;
     
     abort-upgrade|abort-deconfigure|abort-remove)

Modified: packages/unstable/networkmanager/debian/network-manager.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.preinst?rev=2159&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.preinst (original)
+++ packages/unstable/networkmanager/debian/network-manager.preinst Thu Apr  3 00:53:19 2008
@@ -35,10 +35,7 @@
 
 
 case "$1" in
-    install)
-        ;;
-
-    upgrade)
+    install|upgrade)
 	# Upgrade from previous versions
         if dpkg --compare-versions "$2" lt "0.6.4-8"; then
 	    if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then

Modified: packages/unstable/networkmanager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/rules?rev=2159&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/rules (original)
+++ packages/unstable/networkmanager/debian/rules Thu Apr  3 00:53:19 2008
@@ -12,7 +12,7 @@
 		--with-dhcdbd=/usr/sbin/dhcdbd \
 		--with-distro=debian
 	
-DEB_DH_INSTALLINIT_ARGS := -- start 26 2 3 4 5 . stop 14 0 1 6 .
+DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 14 0 1 6 .
 
 DEB_DH_SHLIBDEPS_ARGS := -Xnm-vpn-properties