-
Committer:
Stéphane Graber
-
Date:
2012-05-03 03:55:36 UTC
-
Revision ID:
stgraber@ubuntu.com-20120503035536-1le0erloyn08wnws
Tags: 0.7~rc2+experimentalubuntu1
* Resynchronise with Debian experimental. Remaining changes:
- 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, don't install ifupdown's
/etc/init.d/networking (using net-base's for now)