X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=6264e48dbc9b69abf5310e3d6b0a59b355666b95;hp=1bc61e83a76b048e3f27582a30fc30e4aed65fbc;hb=dc99a9764418a1974c46c55efa73b034f530a5a5;hpb=77b6e19458f37cfde127ec6aa9494c0ac45ad890
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 1bc61e83a..6264e48db 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -97,14 +97,13 @@
involved with boot and systems management.
In contrast to
- chroot1
- systemd-nspawn may be used to boot
- full Linux-based operating systems in a
- container.
+ chroot1Â systemd-nspawn
+ may be used to boot full Linux-based operating systems
+ in a container.
Use a tool like
yum8,
- debootstrap8
+ debootstrap8,
or
pacman8
to set up an OS directory tree suitable as file system
@@ -136,7 +135,7 @@
As a safety check
systemd-nspawn will verify the
- existance of /etc/os-release in
+ existence of /etc/os-release in
the container tree before starting the container (see
os-release5). It
might be necessary to add this file to the container
@@ -239,10 +238,20 @@
container is used.
+
+
+
+ Make the container
+ part of the specified slice, instead
+ of the
+ machine.slice.
+
+
+
- Set the specified uuid
+ Set the specified UUID
for the container. The init system
will initialize
/etc/machine-id
@@ -250,16 +259,6 @@
-
-
-
-
- Makes the container appear in
- other hierarchies than the name=systemd:/ one.
- Takes a comma-separated list of controllers.
-
-
-
@@ -274,7 +273,7 @@
Mount the root file
- system read only for the
+ system read-only for the
container.
@@ -283,7 +282,7 @@
List one or more
additional capabilities to grant the
- container. Takes a comma separated
+ container. Takes a comma-separated
list of capability names, see
capabilities7
for more information. Note that the
@@ -335,7 +334,7 @@
/var/log/journal
exists, it will be bind mounted
into the container. If the
- subdirectory doesn't exist, no
+ subdirectory does not exist, no
linking is performed. Effectively,
booting a container once with
guest or
@@ -443,7 +442,8 @@
unshare1,
yum8,
debootstrap8,
- pacman8
+ pacman8,
+ systemd.slice5