X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=665518dd15ed4adf76b603086bc675bfb072972d;hb=48b5804a48b2b629fa793cc93bcb4a9c6edf9962;hp=ba2c5a487b693270d03d7d2646c227278b400aca;hpb=39ed67d14694983dabd6641c02216aa440eed767;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index ba2c5a487..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,16 +239,97 @@
container is used.
+
+
+
+ Set the specified UUID
+ for the container. The init system
+ will initialize
+ /etc/machine-id
+ from this if this file is not set yet.
+
+
+
Make the container
part of the specified slice, instead
- of the
+ of the default
machine.slice.
+
+
+
+ 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
+ .
+
+
+
+
+
+ Assign the specified
+ network interface to the
+ container. This will move the
+ specified interface from the calling
+ namespace and place it in the
+ container. When the container
+ terminates it is moved back to the
+ 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
+ .
+
+
+
+
+
+ Adds the host side of the
+ ethernet link created with
+
+ to the specified bridge. Note that
+
+ implies
+ .
+
+
@@ -259,35 +351,6 @@
-
-
-
- Set the specified UUID
- for the container. The init system
- will initialize
- /etc/machine-id
- from this if this file is not set yet.
-
-
-
-
-
-
- Turn off networking in
- the container. This makes all network
- interfaces unavailable in the
- container, with the exception of the
- loopback device.
-
-
-
-
-
- Mount the root file
- system read-only for the
- container.
-
-
@@ -310,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.
@@ -375,6 +441,14 @@
.
+
+
+
+ Mount the root file
+ system read-only for the
+ container.
+
+
@@ -409,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.
-
-