Merge lp:~penguin359/ubuntu/precise/network-manager/fix-for-1005091-precise into lp:ubuntu/precise/network-manager

[Loren M. Lang]

Fixed issue with NetworkManager failing to disable all lines related to network interface when taking over management of the device. Prior to this fix, if IPv6 was employed on the network, it would not disable the inet6 lines for the interface thereby preventing NetworkManager from taking over control of the interface, but still disabling dhcp in the /etc/network/interfaces file.

[Mathieu Trudel-Lapierre (cyphermox)]

OK; so this one is technically correct but against the wrong branch; Rejected :)

review: Disapprove

Unmerged revisions

163. By Loren M. Lang on 2012-05-27

Fixed issue when installing NetworkManager with IPv6 enabled

When NetworkManager is installed while there are automatic interfaces
with both inet dhcp and inet6 auto (IPv6-enabled) interfaces,
NetworkManager would disable the dhcp lines without disabling the auto
lines for IPv6 preventing NetworkManager from actually taking over
management of the interface.

=== modified file 'debian/ifblacklist_migrate.sh'
--- debian/ifblacklist_migrate.sh	2012-03-08 13:56:38 +0000
+++ debian/ifblacklist_migrate.sh	2012-05-27 08:15:24 +0000
@@ -38,7 +38,7 @@
     cp $NIF_FILE "$NIF_FILE.bak-${backup_suffix}"
     for i in $ifaces_to_disable; do
 	echo -n "Disabling interface: $i ... "
-	sed -i -e"/^[[:space:]]*iface[[:space:]]\+$i[[:space:]].*dhcp/,/^[[:space:]]*\(iface\|auto\|mapping\|source\|allow-\)/ { /^[[:space:]]*iface[[:space:]]\+$i[[:space:]].*dhcp/ s/^/#NetworkManager#/; /^[[:space:]]*\(iface\|auto\|mapping\|source\|allow-\)/ ! s/^[^#]/#NetworkManager#/; }" $NIF_FILE
+	sed -i -e"/^[[:space:]]*iface[[:space:]]\+$i[[:space:]].*\(dhcp\|auto\)/,/^[[:space:]]*\(iface\|auto\|mapping\|source\|allow-\)/ { /^[[:space:]]*iface[[:space:]]\+$i[[:space:]].*\(dhcp\|auto\)/ s/^/#NetworkManager#/; /^[[:space:]]*\(iface\|auto\|mapping\|source\|allow-\)/ ! s/^[^#]/#NetworkManager#/; }" $NIF_FILE
 	echo done.
     done
 fi