-
Committer:
Stéphane Graber
-
Date:
2012-09-13 16:18:07 UTC
-
Revision ID:
stgraber@ubuntu.com-20120913161807-47rw7n7xi8g2a242
Tags: 0.7.2ubuntu1
* Merge ifupdown 0.7.2 from Debian. Remaining changes:
- If the /etc/NetworkManager/NetworkManager.conf file is present
but doesn't have the "ifupdown:managed" the previous upload instructed
the iniparser to return -1, which evaluates to TRUE. We instead instruct
it to return 0, as we shouldn't prevent ifupdown from managing the
interfaces in that case, as NM won't either. (LP: #281984)
- debian/postinst: If the loopback interface is missing from the config
in /etc/network/interfaces, add it on upgrade.
- Add jobs and hooks for upstart.
* Remove /etc/default/networking as the upstart job doesn't use it and
can't really use it without some significant changes (support exclusion
lists in all the upstart jobs).
* Add resolvconf (8) to SEE ALSO section of the interfaces manpage.
(LP: #1043335)