X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=5bddd895036d6be33a2e8c87e53216435b4953dd;hb=73e231abde39f22097df50542c745e01de879836;hp=ffd707092c013d87553066f9ac46ff26a4cd2275;hpb=a42c8b54b1619078c02f5e439bd2564c6d0f901f;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index ffd707092..5bddd8950 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -173,6 +173,17 @@
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.
+
+
@@ -228,37 +239,6 @@
container is used.
-
-
-
- Make the container
- part of the specified slice, instead
- of the
- machine.slice.
-
-
-
-
-
-
-
- Sets the SELinux
- security context to be used to label
- processes in the container.
-
-
-
-
-
-
-
- Sets the SELinux security
- context to be used to label files in
- the virtual API file systems in the
- container.
-
-
-
@@ -270,17 +250,29 @@
+
+
+
+ Make the container
+ part of the specified slice, instead
+ of the default
+ machine.slice.
+
+
+
- Turn off networking in
- the container. This makes all network
- interfaces unavailable in the
- container, with the exception of the
- loopback device and those specified
- with
- . If
- this option is specified the
+ Disconnect networking
+ of the container from the host. This
+ makes all network interfaces
+ unavailable in the container, with the
+ exception of the loopback device and
+ those specified with
+
+ and configured with
+ . If
+ this option is specified, the
CAP_NET_ADMIN capability will be added
to the set of capabilities the
container retains. The latter may be
@@ -297,7 +289,7 @@
specified interface from the calling
namespace and place it in the
container. When the container
- terminates it is moved back to the
+ terminates, it is moved back to the
host namespace. Note that
implies
@@ -308,11 +300,55 @@
-
+
+
+ Create a virtual
+ ethernet link between host and
+ container. The host side of the
+ ethernet link will be available as
+ network interface named after the
+ container's name (as specified with
+ ), prefixed
+ with ve-. The
+ container side of the the ethernet
+ link will be named
+ host0. Note that
+
+ implies
+ .
+
- Mount the root file
- system read-only for the
- container.
+
+
+
+ Adds the host side of the
+ ethernet link created with
+
+ to the specified bridge. Note that
+
+ implies
+ .
+
+
+
+
+
+
+ Sets the SELinux
+ security context to be used to label
+ processes in the container.
+
+
+
+
+
+
+
+ Sets the SELinux security
+ context to be used to label files in
+ the virtual API file systems in the
+ container.
+
@@ -342,7 +378,7 @@
is retained if
is
specified. If the special value
- all is passed all
+ all is passed, all
capabilities are
retained.
@@ -405,6 +441,14 @@
.
+
+
+
+ Mount the root file
+ system read-only for the
+ container.
+
+
@@ -439,17 +483,6 @@
more than once.
-
-
-
-
- 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.
-
-
@@ -491,7 +524,7 @@
and shown by tools such as
ps1. If
the container does not run an init
- system it is recommended to set this
+ system, it is recommended to set this
option to no. Note
that
implies