X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=950558feec085c53193ab3c2f933a09fa9af51c9;hp=1ad8e6ec056fb2ed9a33ca689d5808783776b704;hb=355b59e252c9910e44a1ad95c045ba8db58a4f6a;hpb=dca348bcbb462305864526c587495a14a76bfcde

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 1ad8e6ec0..950558fee 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -136,8 +136,9 @@
 
                 <para>As a safety check
                 <command>systemd-nspawn</command> will verify the
-                existence of <filename>/etc/os-release</filename> in
-                the container tree before starting the container (see
+                existence of <filename>/usr/lib/os-release</filename>
+                or <filename>/etc/os-release</filename> in the
+                container tree before starting the container (see
                 <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>). It
                 might be necessary to add this file to the container
                 tree manually if the OS of the container is too old to
@@ -358,7 +359,7 @@
                                 <option>--network-bridge=</option>
                                 implies
                                 <option>--network-veth</option>. If
-                                this option is used the host side of
+                                this option is used, the host side of
                                 the Ethernet link will use the
                                 <literal>vb-</literal> prefix instead
                                 of <literal>ve-</literal>.</para></listitem>
@@ -503,6 +504,30 @@
                                 mounts.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--tmpfs=</option></term>
+
+                                <listitem><para>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
+                                <filename>/var</filename> as tmpfs, to
+                                allow state-less systems, in
+                                particular when combined with
+                                <option>--read-only</option>.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>--setenv=</option></term>
 
@@ -601,7 +626,7 @@
                                 <literal>x86-64</literal> 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