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

[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)]

Thanks!

Could you please re-do your changes against the packaging branch for network-manager:

lp:~network-manager/network-manager/ubuntu

Disapprove, since this is the wrong branch; but otherwise it looks good on paper (I'll test on my end too).

review: Disapprove

[Loren M. Lang (penguin359)]

I've recreated this merge proposal at:

https://code.launchpad.net/~penguin359/network-manager/ubuntu-fix-for-1005091/+merge/107932

And using lp:~network-manager/network-manager/ubuntu as the parent branch, but that appears to be what I used the first time so I might be misunderstanding things. My second MP listed above also includes an additional related fix so it should be used instead. According to Bzr-Vcs: in the Deb, https://code.launchpad.net/~network-manager/network-manager/ubuntu is the branch used for NetworkManager so I think I have the right one.

[Mathieu Trudel-Lapierre (cyphermox)]

Rejected: superseded by another MP.

[Mathieu Trudel-Lapierre (cyphermox)]

This is getting messy, but this is indeed the branch I want to merge; based on lp:~network-maanger/network-manager/ubuntu.

=== modified file 'debian/ifblacklist_migrate.sh'
--- debian/ifblacklist_migrate.sh	2012-03-08 14:20:04 +0000
+++ debian/ifblacklist_migrate.sh	2012-05-27 08:07:20 +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