X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=a4f222c3495a6a14d17a6df538bc9074bf17e65b;hb=055d406624cb9e01963558767420b71e5f75d2d3;hp=8f09c1b41be8ad351170f76f2fd3e425c8963d1b;hpb=08af0da26935e827b58809ff1946e2f7d496e666;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 8f09c1b41..a4f222c34 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see .
-->
-
+systemd-nspawn
@@ -158,32 +159,6 @@
The following options are understood:
-
-
-
-
- Prints a short help
- text and exits.
-
-
-
-
-
- Prints a version string
- and exits.
-
-
-
-
-
-
- Turns off any status
- output by the tool itself. When this
- switch is used, the only output
- from nspawn will be the console output
- of the container OS itself.
-
-
@@ -285,7 +260,7 @@
Assign the specified
network interface to the
- container. This will move the
+ container. This will remove the
specified interface from the calling
namespace and place it in the
container. When the container
@@ -299,12 +274,36 @@
container.
+
+
+
+ Create a
+ macvlan interface
+ of the specified Ethernet network
+ interface and add it to the
+ container. A
+ macvlan interface
+ is a virtual interface that adds a
+ second MAC address to an existing
+ physical Ethernet link. The interface
+ in the container will be named after
+ the interface on the host, prefixed
+ with mv-. Note that
+
+ implies
+ . This
+ option may be used more than once to
+ add multiple network interfaces to the
+ container.
+
+
Create a virtual
- Ethernet link between host and
- container. The host side of the
+ Ethernet link
+ (veth) between host
+ and container. The host side of the
Ethernet link will be available as a
network interface named after the
container's name (as specified with
@@ -577,6 +576,20 @@
reported on the
host.
+
+
+
+
+
+ Turns off any status
+ output by the tool itself. When this
+ switch is used, the only output
+ from nspawn will be the console output
+ of the container OS itself.
+
+
+
+