~ubuntu-branches/ubuntu/utopic/bridge-utils/utopic

Viewing all changes in revision 28.

  • Committer: Package Import Robot
  • Author(s): Logan Rosen
  • Date: 2012-11-19 21:28:42 UTC
  • mfrom: (5.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20121119212842-o5uiwiokw0ipron1
Tags: 1.5-6ubuntu1
* Merge from Debian unstable. Remaining changes:
  - Set BRIDGE_HOTPLUG=yes as that's the behaviour we had in the past and
    need for the event based networking. Reverting change from 1.5-4.
  - Don't call ifup from bridge-network-interface, instead just call brctl
    and let udev/upstart bring the interface up.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: