X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=a4f222c3495a6a14d17a6df538bc9074bf17e65b;hb=13e8ceb84e56907d73b6b07418deb37faaf0e66d;hp=5bddd895036d6be33a2e8c87e53216435b4953dd;hpb=73e231abde39f22097df50542c745e01de879836;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 5bddd8950..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, then the only output
- by 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,18 +274,42 @@
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 will be available as
+ 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
), prefixed
with ve-. The
- container side of the the ethernet
+ container side of the the Ethernet
link will be named
host0. Note that
@@ -321,13 +320,17 @@
- Adds the host side of the
- ethernet link created with
-
- to the specified bridge. Note that
-
+ Adds the host side of
+ the Ethernet link created with
+ to the
+ specified bridge. Note that
+
implies
- .
+ . If
+ this option is used the host side of
+ the Ethernet link will use the
+ vb- prefix instead
+ of ve-.
@@ -466,7 +469,7 @@
destination in the container. The
option
creates read-only bind
- mount.
+ mounts.
@@ -540,13 +543,13 @@
container in, simply register the
service or scope unit
systemd-nspawn has
- been invoked in in
+ been invoked in with
systemd-machined8. This
has no effect if
is
used. This switch should be used if
systemd-nspawn is
- invoked from within an a service unit,
+ invoked from within a service unit,
and the service unit's sole purpose
is to run a single
systemd-nspawn
@@ -555,6 +558,38 @@
session.
+
+
+
+ Control the
+ architecture ("personality") reported
+ by
+ uname2
+ in the container. Currently, only
+ x86 and
+ x86-64 are
+ supported. This is useful when running
+ a 32bit container on a 64bit
+ host. If this setting is not used
+ the personality reported in the
+ container is the same as the one
+ 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.
+
+
+
+