diff options
| author | Jouke Witteveen <j.witteveen@gmail.com> | 2013-07-24 10:57:48 +0200 |
|---|---|---|
| committer | Jouke Witteveen <j.witteveen@gmail.com> | 2013-07-24 11:39:21 +0200 |
| commit | 20c66d6499f22adad6c1dae854a627f061c5fbcb (patch) | |
| tree | 5c21c28ce2f17814559188c2ba49ef4bf73dfd2a /docs | |
| parent | cbd00d5652700792a7833617d947f8a78bb34ccc (diff) | |
| download | netctl-20c66d6499f22adad6c1dae854a627f061c5fbcb.tar.gz netctl-20c66d6499f22adad6c1dae854a627f061c5fbcb.tar.xz | |
Use iproute2 for bridging (FS#36165)
This sheds the dependency on the old bridge-utils (brctl).
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/examples/bridge | 6 | ||||
| -rw-r--r-- | docs/netctl.profile.5.txt | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/docs/examples/bridge b/docs/examples/bridge index 19cb0bd..3f38d7a 100644 --- a/docs/examples/bridge +++ b/docs/examples/bridge @@ -3,7 +3,5 @@ Interface=br0 Connection=bridge BindsToInterfaces=(eth0 eth1 tap0) IP=dhcp -## sets forward delay time -#FwdDelay=0 -## sets max age of hello message -#MaxAge=10 +## Ignore (R)STP and immediately activate the bridge +#SkipForwardingDelay=yes diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt index fe0073e..ec36f47 100644 --- a/docs/netctl.profile.5.txt +++ b/docs/netctl.profile.5.txt @@ -286,14 +286,12 @@ connections of the `bond' type. OPTIONS FOR `bridge' CONNECTIONS -------------------------------- The interfaces of 'BindsToInterfaces' take part in the bridge named by -'Interface'. Next to the *ip options*, the following are understood for +'Interface'. Next to the *ip options*, the following is understood for connections of the `bridge' type: -'FwdDelay=':: - Forward delay of the bridge. See *brctl*(8) for details. - -'MaxAge=':: - Maximum age parameter. See *brctl*(8) for details. +'SkipForwardingDelay=':: + Skip \(R)STP and immediately activate all bridge members. This can + be useful when DHCP is used on the bridge. OPTIONS FOR `pppoe' CONNECTIONS |