about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/network-manager.maintscript3
-rw-r--r--debian/network-manager.postinst7
2 files changed, 0 insertions, 10 deletions
diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript
index bb7498aa..47090bb9 100644
--- a/debian/network-manager.maintscript
+++ b/debian/network-manager.maintscript
@@ -1,4 +1 @@
-mv_conffile /etc/NetworkManager/dispatcher.d/01ifupdown /etc/NetworkManager/dispatcher.d/01-ifupdown 1.8.0-5~
-rm_conffile /etc/dbus-1/system.d/nm-dispatcher.conf 1.14.4-4~
-rm_conffile /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf 1.14.4-4~
 rm_conffile /etc/init.d/network-manager 1.25.91-1~
diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst
index 2996afcc..e5fb9373 100644
--- a/debian/network-manager.postinst
+++ b/debian/network-manager.postinst
@@ -41,13 +41,6 @@ case "$1" in
             fi
         fi
 
-        # Fix up existing /etc/resolv.conf symlinks after the migration to /run
-        if dpkg --compare-versions "$2" lt-nl "1.8.0-4"; then
-            if [ "$(readlink /etc/resolv.conf)" = /var/run/NetworkManager/resolv.conf ] ; then
-                ln -sf  /run/NetworkManager/resolv.conf /etc/resolv.conf
-            fi
-        fi
-
         if dpkg --compare-versions "$2" lt-nl "1.20.4-2"; then
             if [ -f /var/lib/NetworkManager/secret_key ]; then
                 chmod 0600 /var/lib/NetworkManager/secret_key