lp:ubuntu/quantal/ifupdown
- Get this branch:
- bzr branch lp:ubuntu/quantal/ifupdown
Branch merges
Branch information
- Owner:
- Ubuntu branches
- Status:
- Mature
Recent revisions
- 96. By Stéphane Graber
-
* Fix regression with the removal of the sysvinit networking job:
- Don't bring 'lo' down (add it to --exclude)
- Emit deconfiguring-networking (LP: #1061639) - 95. By Stéphane Graber
-
* Merge ifupdown 0.7.2 from Debian. Remaining changes:
- If the /etc/NetworkManager/NetworkMan ager.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) - 94. By Steve Langasek
-
* Add a 'stop on' rule for the networking service, so that we tear the
network down at the correct point in the shutdown sequence (after remote
filesystems have been unmounted). This is mostly needed when using
insserv upstart integration (not yet in Ubuntu) to ensure the shutdown
doesn't hang waiting for an unsatisfiable init script dependency, but it
also addresses the need for shutting down networking on runlevel changes
- provided that umountnfs.sh itself is called for runlevel 1, which it
currently is not.
* Also start the job on runlevel [2345]. This is a no-op during a normal
boot since the network will be started *before* runlevel is emitted, but
is needed to restart the network after a change from runlevel 1.
LP: #752481. - 93. By Stéphane Graber
-
Make /etc/init.
d/networking a conffile even if it's a symlink.
This should help dpkg do the right thing when moving the file from netbase
over to ifupdown. This is a workaround for (LP: #1023437) - 92. By Stéphane Graber
-
* Resynchronise with Debian experimental. Remaining changes:
- If the /etc/NetworkManager/NetworkMan ager.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 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)
* Don't include new /etc/default/networking as it's incompatible with event
based networking configuration.
* Don't bump dependency on initscripts as the dependency isn't required with
the upstart jobs and the new version isn't in Ubuntu yet.
* Drop our code hardcoding the metric at 100 for the default gateway,
this was used to avoid conflicts between ifupdown and Network Manager.
Nowadays Network Manager won't manage an interface defined in ifupdown
and the rest of the metric changes are now in ifupdown. - 91. By Stéphane Graber
-
* 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/NetworkMan ager.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) - 90. By Stéphane Graber
-
* Fix upstart hook to ignore ADDRFAM=meta (ifup -a).
* Cherry-pick commit 6c67e908b934 from upstream, making ifquery only
list interfaces with a matching iface entry. - 89. By Stéphane Graber
-
* 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/NetworkMan ager.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) - 87. By Steve Langasek
-
Start networking upstart job on 'or container', to let us optimize the
udevtrigger job.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/raring/ifupdown