diff options
| author | Michael Biebl <biebl@debian.org> | 2010-01-21 23:38:04 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-01-21 23:38:04 +0000 |
| commit | 0f230e471cf9c331949bd599121f7982ed4dfbbe (patch) | |
| tree | e64fedc481126e7f51d574d7cdd3af92c877e5e2 /debian/network-manager.preinst | |
| parent | db348dabb3bad31bb00bc967aa44fb4a5e0321d3 (diff) | |
Remove the obsolete conffile /etc/dbus-1/system.d/nm-system-settings.conf
on upgrades. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@3394 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian/network-manager.preinst')
| -rw-r--r-- | debian/network-manager.preinst | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 5bfef656..c00618e7 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -44,10 +44,10 @@ case "$1" in # Upgrade from previous versions if dpkg --compare-versions "$2" lt "0.6.4-8"; then if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then - /etc/dbus-1/event.d/25NetworkManager stop + /etc/dbus-1/event.d/25NetworkManager stop fi if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then - /etc/dbus-1/event.d/26NetworkManagerDispatcher stop + /etc/dbus-1/event.d/26NetworkManagerDispatcher stop fi rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher @@ -67,6 +67,9 @@ case "$1" in mv /var/run/NetworkManager/NetworkManager.pid /var/run/ fi fi + if dpkg --compare-versions "$2" lt "0.7.998-1"; then + rm_conffile network-manager /etc/dbus-1/system.d/nm-system-settings.conf + fi ;; abort-upgrade) |