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

Proposed by Loren M. Lang
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 519
Merged at revision: 522
Proposed branch: lp://staging/~penguin359/network-manager/ubuntu-fix-for-1005091
Merge into: lp://staging/~network-manager/network-manager/ubuntu
Diff against target: 11 lines (+1/-0)
1 file modified
debian/ (+1/-0)
To merge this branch: bzr merge lp://staging/~penguin359/network-manager/ubuntu-fix-for-1005091
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email:

Description of the change

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.

This is a slightly different fix than the previous pull request due to a possible failure when a more complicated interfaces file is used. Here is my test case, only eth0 and all of eth0 should be commented out:

# The loopback network interface
auto lo
iface lo inet loopback

# The primary network interface
auto eth0
iface eth0 inet dhcp
        hostname unknown
# Enable IPv6 Autoconfiguration
iface eth0 inet6 auto
        dhcp 1

auto eth1
iface eth1 inet static

To post a comment you must log in.
Revision history for this message
Loren M. Lang (penguin359) wrote :

Hmm, it looks like I've just repeated the exact same procedure. I thought I had the right branch, but it appears to be identical to my previous request. I'll have to do a little more reading looks like.

Revision history for this message
Loren M. Lang (penguin359) wrote :
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

I see, I just got confused by the location of the MP, sorry :)

Merging now.

review: Approve
Revision history for this message
Loren M. Lang (penguin359) wrote :

Yes, I got confused when I uploaded the branch (it was my first upload to launchpad!), I think I was looking at the webpage for the precise branch at the time, but when I realized my error, I didn't see an easy way to rename it so I just submitted the MP manually to the appropriate branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.


People subscribed via source and target branches