diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2016-10-24 13:51:05 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2016-10-24 13:51:05 -0700 |
| commit | cfe807849856f9929801d24e4f37c4540a507207 (patch) | |
| tree | b2ec09f4f96d879cbcc26c8309664a2764095709 | |
| parent | bashisms: Fix bashisms for dash support. (diff) | |
| parent | doc: bridge: add explicit iproute2 hint (diff) | |
| download | netifrc-cfe807849856f9929801d24e4f37c4540a507207.tar.gz netifrc-cfe807849856f9929801d24e4f37c4540a507207.tar.bz2 netifrc-cfe807849856f9929801d24e4f37c4540a507207.zip | |
Merge remote-tracking branch 'github/pull/23/head'
| -rw-r--r-- | doc/net.example.Linux.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in index 72608bb..e6cc180 100644 --- a/doc/net.example.Linux.in +++ b/doc/net.example.Linux.in @@ -896,7 +896,8 @@ #----------------------------------------------------------------------------- # Bridging (802.1d) -# For bridging support emerge net-misc/bridge-utils +# Preferred: iproute2, emerge sys-apps/iproute2 +# Legacy: brctl, emerge net-misc/bridge-utils # To add ports to bridge br0 #bridge_br0="eth0 eth1" @@ -931,7 +932,7 @@ #sethello 2 #stp on" -# You can also configure the bridge or bridge members via sysfs on 2.6 kernels +# You can configure the bridge or bridge members via sysfs on 2.6 kernels # or newer. See the kernel bridge documentation for a description of these # options. #bridge_stp_state_br0="0" |