diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/network-manager.postinst | 12 | ||||
| -rw-r--r-- | debian/network-manager.preinst | 5 | ||||
| -rwxr-xr-x | debian/rules | 2 |
4 files changed, 19 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 7c48e9c2..aa1d5892 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,8 +28,12 @@ network-manager (0.6.6-1) UNRELEASED; urgency=low - 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) + * 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@debian.org> Thu, 03 Apr 2008 02:11:34 +0200 + -- Michael Biebl <biebl@debian.org> Thu, 03 Apr 2008 02:37:16 +0200 network-manager (0.6.5-5) unstable; urgency=low diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index c2a445c7..4d7cb755 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -43,6 +43,18 @@ case "$1" in 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) diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 3f737448..c3cc480e 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -35,10 +35,7 @@ prep_rm_conffile() 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 diff --git a/debian/rules b/debian/rules index a4a1c76d..9442c792 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --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 |