From 3672f7938dd11b0d16e7cfe8804bc844a835bf80 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 29 Jan 2013 02:25:35 +0100 Subject: No longer run the ifblacklist_migrate.sh script upon installation. This script was used to comment out DHCP type network interface configurations in /etc/network/interfaces as otherwise NM would mark such devices as unmanaged. This script was buggy though and sometimes created a broken network configuration. Since debian-installer in wheezy (7.0) will create proper configuration for NM if the network-manager package is part of the installation, this is no longer necessary. If users make a minimal system installation and install the network-manager package afterwards, show a warning in postinst if we find any interface configurations in /etc/network/interfaces. (Closes: #688355, #690987, #606268) --- debian/network-manager.postrm | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/network-manager.postrm') diff --git a/debian/network-manager.postrm b/debian/network-manager.postrm index 5bc3e9b4..a95aa9a1 100644 --- a/debian/network-manager.postrm +++ b/debian/network-manager.postrm @@ -28,6 +28,7 @@ case "$1" in ;; remove) # Restore the ifupdown configuration that were disabled at installation + # TODO: drop this code in jessie backup_suffix=0 while test -e /etc/network/interfaces.bak-${backup_suffix}; do backup_suffix=$(($backup_suffix + 1)) -- cgit 1.3.0-6-gf8a5 From 6d2cee0398bb180a2827a9b05198c31db4f49086 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 29 Jan 2013 04:01:53 +0100 Subject: Drop remaining bits of /e/n/i mangling Trying to restore a potentially outdated /e/n/i file most likely does more harm then good. Someone upgrading from squeeze to wheezy most likely has adjusted his network configuration by now. --- debian/network-manager.postrm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'debian/network-manager.postrm') diff --git a/debian/network-manager.postrm b/debian/network-manager.postrm index a95aa9a1..d41768c5 100644 --- a/debian/network-manager.postrm +++ b/debian/network-manager.postrm @@ -27,15 +27,8 @@ case "$1" in fi ;; remove) - # Restore the ifupdown configuration that were disabled at installation - # TODO: drop this code in jessie - backup_suffix=0 - while test -e /etc/network/interfaces.bak-${backup_suffix}; do - backup_suffix=$(($backup_suffix + 1)) - done - if [ -f /etc/network/interfaces ]; then - sed -i.bak-${backup_suffix} -e "s/^#NetworkManager#//g" /etc/network/interfaces - fi + # Since we no longer run the ifblacklist_migrate.sh script + # we also don't need to clean up anymore afterwards. ;; upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; -- cgit 1.3.0-6-gf8a5