X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=665518dd15ed4adf76b603086bc675bfb072972d;hb=141a79f491fd4bf5ea0d66039065c9f9649bfc0e;hp=7a88436bcfd17ae61b5f619994e785b72b702884;hpb=aa28aefe61c5406c5cb631f3e82457b6d1bcc967;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 7a88436bc..665518dd1 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,14 +250,34 @@
+
+
+
+ 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.
+ 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
+ disabled by using
+ .
@@ -290,15 +290,65 @@
namespace and place it in the
container. When the container
terminates it is moved back to the
- host namespace.
+ host namespace. 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
+ 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.
+
@@ -323,8 +373,11 @@
CAP_SYS_CHROOT, CAP_SYS_NICE,
CAP_SYS_PTRACE, CAP_SYS_TTY_CONFIG,
CAP_SYS_RESOURCE, CAP_SYS_BOOT,
- CAP_AUDIT_WRITE, CAP_AUDIT_CONTROL. If
- the special value
+ CAP_AUDIT_WRITE,
+ CAP_AUDIT_CONTROL. Also CAP_NET_ADMIN
+ is retained if
+ is
+ specified. If the special value
all is passed all
capabilities are
retained.
@@ -388,6 +441,14 @@
.
+
+
+
+ Mount the root file
+ system read-only for the
+ container.
+
+
@@ -422,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.
-
-