From ab046dde6f355f4a8b07ff6120a7ef51f5d49fc9 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Sun, 16 Feb 2014 21:12:47 +0100
Subject: 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.
---
 man/systemd-nspawn.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'man/systemd-nspawn.xml')

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index d6f2d11dcc..665518dd15 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
@@ -318,6 +318,18 @@
                                 <option>--private-network</option>.</para></listitem>
                         </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>
-- 
cgit v1.2.3-54-g00ecf