X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=950558feec085c53193ab3c2f933a09fa9af51c9;hb=6e81b5b9dc10dd0b47102afe42457e4a314cb01f;hp=18946167c559d07bce7d321c5c87f6062679e44c;hpb=70a44afee385c4afadaab9a002b3f9dd44aedf4a;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 18946167c..950558fee 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -136,8 +136,9 @@
As a safety check
systemd-nspawn will verify the
- existence of /etc/os-release in
- the container tree before starting the container (see
+ existence of /usr/lib/os-release
+ or /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
tree manually if the OS of the container is too old to
@@ -340,7 +341,7 @@
container's name (as specified with
), prefixed
with ve-. The
- container side of the the Ethernet
+ container side of the Ethernet
link will be named
host0. Note that
@@ -358,7 +359,7 @@
implies
. If
- this option is used the host side of
+ this option is used, the host side of
the Ethernet link will use the
vb- prefix instead
of ve-.
@@ -503,6 +504,30 @@
mounts.
+
+
+
+ Mount a tmpfs file
+ system into the container. Takes a
+ single absolute path argument that
+ specifies where to mount the tmpfs
+ instance to (in which case the
+ directory access mode will be chosen
+ as 0755, owned by root/root), or
+ optionally a colon-separated pair of
+ path and mount option string, that is
+ used for mounting (in which case the
+ kernel default for access mode and
+ owner will be chosen, unless otherwise
+ specified). This option is
+ particularly useful for mounting
+ directories such as
+ /var as tmpfs, to
+ allow state-less systems, in
+ particular when combined with
+ .
+
+
@@ -601,7 +626,7 @@
x86-64 are
supported. This is useful when running
a 32-bit container on a 64-bit
- host. If this setting is not used
+ host. If this setting is not used,
the personality reported in the
container is the same as the one
reported on the