summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-02-16 21:12:47 +0100
committerTom Gundersen <teg@jklm.no>2014-02-16 21:40:28 +0100
commitab046dde6f355f4a8b07ff6120a7ef51f5d49fc9 (patch)
tree258e013106cbc9054726a87906ca6747674f1291 /man
parent1733a00f62f1db9a0506c8d674b4b5ef7d235025 (diff)
nspawn: add new --network-bridge= switch
This adds the host side of the veth link to the given bridge. Also refactor the creation of the veth interfaces a bit to set it up from the host rather than the container. This simplifies the addition to the bridge, but otherwise the behavior is unchanged.
Diffstat (limited to 'man')
-rw-r--r--man/systemd-nspawn.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index d6f2d11dc..665518dd1 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -270,7 +270,7 @@
exception of the loopback device and
those specified with
<option>--network-interface=</option>
- and configured ith
+ and configured with
<option>--network-veth</option>. If
this option is specified the
CAP_NET_ADMIN capability will be added
@@ -319,6 +319,18 @@
</varlistentry>
<varlistentry>
+ <term><option>--network-bridge=</option></term>
+
+ <listitem><para>Adds the host side of the
+ ethernet link created with
+ <option>--network-veth</option>
+ to the specified bridge. Note that
+ <option>--network-bridge</option>
+ implies
+ <option>--network-veth</option>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>-Z</option></term>
<term><option>--selinux-context=</option></term>