diff options
Diffstat (limited to 'debian/network-manager.postinst')
| -rw-r--r-- | debian/network-manager.postinst | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index c2a445c7..c7694427 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -16,25 +16,8 @@ # <postinst> abort-remove in-favour <new-package> <version> -# Remove a no-longer used conffile -rm_conffile() -{ - CONFFILE="$1" - - if [ -e "$CONFFILE".dpkg-remove ]; then - echo "Removing obsolete conffile $CONFFILE" - rm -f "$CONFFILE".dpkg-remove - fi -} - - case "$1" in configure) - # Upgrade from previous versions - if dpkg --compare-versions "$2" lt "0.6.4-8"; then - rm_conffile /etc/dbus-1/event.d/25NetworkManager - rm_conffile /etc/dbus-1/event.d/26NetworkManagerDispatcher - fi if ! getent group netdev > /dev/null; then addgroup --quiet --system netdev @@ -43,6 +26,15 @@ 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 + fi + ;; abort-upgrade|abort-deconfigure|abort-remove) |