~ubuntu-branches/ubuntu/wily/bridge-utils/wily

Viewing all changes in revision 16.

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2011-05-08 23:02:24 UTC
  • mfrom: (5.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110508230224-af7t6nqb5b3k6krf
Tags: 1.5-2ubuntu1
* Merge from Debian unstable (LP: #483427, LP: #377474).  Remaining changes:
  - Add an upstart job which triggers on each net-device-added event, to
    see whether we need to add this to a bridge.
* Changes merged in Debian:
  - debian/rules, debian/bridge-utils.sh, debian/dirs, debian/ifupdown.sh:
    factor out the parsing of bridge_ports into a reusable shell library.
* Replace the upstart job with a udev rule instead; thanks to Manty for
  the suggestion.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: