-
Committer:
Stéphane Graber
-
Date:
2012-11-05 16:06:10 UTC
-
Revision ID:
stgraber@ubuntu.com-20121105160610-45vpj8cu7t7cbuu4
Tags: 0.7.5ubuntu1
* Merge ifupdown 0.7.5 from Debian. Remaining changes:
- debian/ifupdown.neworking.upstart (forwarded to Debian):
+ Don't bring 'lo' down (add it to --exclude)
+ Emit deconfiguring-networking (LP: #1061639)
- 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)
- 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.
- Decrease version dependency against initscripts as the new version isn't
in Ubuntu yet and the relevant change was added to the older version.
* Remove versioned dependency against lsb-base and matching init_is_upstart
calls in the various scripts as the new version isn't in Ubuntu yet.
* debian/rules revert changes to dh_installinit calls to force all init
scripts to be only upstart scripts. This can probably be reverted once we
have the new lsb-base.