-
Committer:
Stéphane Graber
-
Date:
2012-06-28 22:21:45 UTC
-
Revision ID:
stgraber@ubuntu.com-20120628222145-kob4o7w7li0y35al
Tags: 0.7ubuntu1
* Resynchronise with Debian experimental. Remaining changes:
(LP: #298488, LP: #663352)
- ifupdown.nw: Use 100 as default route metric unless an explicit metric
parameter is set in /etc/network/interface.
- 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.
* Cherry-pick commit 011d5904c09d from upstream, fixing cases where the
error messages wouldn't be triggered (caused test failure).
* Cherry-pick commit 7c1a226cc995 from upstream, adds support for two
options on dhcpv6 (accept_ra and autoconf) (LP: #1013597)
* Cherry-pick commit 5af7e814faee from upstream, fixing a failure in the
example script generate-interfaces.pl (LP: #286808)
* Cherry-pick commit a1f8efc4d93f from upstream, add --no-scripts as a
parameter to ifup/ifdown, allowing the user to bypass the the scripts
in /etc/network/if-*.d/ (LP: #258782)