X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=71ce0aca438e1c581254156bd23bf74f687e1b1d;hb=4d92e078e9d7e9a9d346065ea5e4afbafbdadb48;hp=b6f2c278dade05adf246d682cc58828197e08318;hpb=9980033377c105d2cd6539c9d73ee61d4c2263b0;p=elogind.git

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index b6f2c278d..71ce0aca4 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -188,7 +188,7 @@
                                 <term><option>-C</option></term>
 
                                 <listitem><para>Makes the container appear in
-                                other hierarchies that the name=systemd:/ one.
+                                other hierarchies than the name=systemd:/ one.
                                 Takes a comma-separated list of controllers.
                                 </para></listitem>
                         </varlistentry>
@@ -232,9 +232,56 @@
                                 CAP_SETUID, CAP_SYS_ADMIN,
                                 CAP_SYS_CHROOT, CAP_SYS_NICE,
                                 CAP_SYS_PTRACE, CAP_SYS_TTY_CONFIG,
-                                CAP_SYS_RESOURCE.</para></listitem>
+                                CAP_SYS_RESOURCE, CAP_SYS_BOOT.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--link-journal=</option></term>
+
+                                <listitem><para>Control whether the
+                                container's journal shall be made
+                                visible to the host system. If enabled
+                                allows viewing the container's journal
+                                files from the host (but not vice
+                                versa). Takes one of
+                                <literal>no</literal>,
+                                <literal>host</literal>,
+                                <literal>guest</literal>,
+                                <literal>auto</literal>. If
+                                <literal>no</literal>, the journal is
+                                not linked. If <literal>host</literal>,
+                                the journal files are stored on the
+                                host file system (beneath
+                                <filename>/var/log/journal/&lt;machine-id&gt;</filename>)
+                                and the subdirectory is bind-mounted
+                                into the container at the same
+                                location. If <literal>guest</literal>,
+                                the journal files are stored on the
+                                guest file system (beneath
+                                <filename>/var/log/journal/&lt;machine-id&gt;</filename>)
+                                and the subdirectory is symlinked into the host
+                                at the same location. If
+                                <literal>auto</literal> (the default),
+                                and the right subdirectory of
+                                <filename>/var/log/journal</filename>
+                                exists, it will be bind mounted
+                                into the container. If the
+                                subdirectory doesn't exist, no
+                                linking is performed. Effectively,
+                                booting a container once with
+                                <literal>guest</literal> or
+                                <literal>host</literal> will link the
+                                journal persistently if further on
+                                the default of <literal>auto</literal>
+                                is used.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-j</option></term>
+
+                                <listitem><para>Equivalent to
+                                <option>--link-journal=guest</option>.</para></listitem>
+                        </varlistentry>
                 </variablelist>
 
         </refsect1>