X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=1f7d74e27322137db1079bb3f146fb0c403e4dbd;hp=76e291881c95c747634b34f0848da8d85de23787;hb=a29271926ad5530276cec486c93ea72ef71a652c;hpb=5076f0ccfd36b67512d44fe355b80305ced7dcba

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 76e291881..1f7d74e27 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -114,6 +114,11 @@
                 two containers is complete and the containers will
                 share very few runtime objects except for the
                 underlying file system.</para>
+
+                <para><command>systemd-nspawn</command> implements the
+                <ulink
+                url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container
+                Interface</ulink> specification.</para>
         </refsect1>
 
         <refsect1>
@@ -227,9 +232,57 @@
                                 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 the host's
+                                <filename>/var/log/journal</filename>)
+                                and a per-machine subdirectory of this
+                                directory is created and bind mounted
+                                into the container at the same
+                                location. If <literal>guest</literal>
+                                the journal files are stored on the
+                                guest file system (beneath the guest's
+                                <filename>/var/log/journal</filename>)
+                                and a per-machine subdirectory of this
+                                directory is symlinked into the host
+                                at the same location. If
+                                <literal>auto</literal> (the default)
+                                and the subdirectory of
+                                <filename>/var/log/journal</filename>
+                                exists as directory it is bind mounted
+                                into the container, but nothing is
+                                done otherwise. Effectively, booting a
+                                container once with
+                                <literal>guest</literal> or
+                                <literal>host</literal> will link the
+                                journal persistantly if further one
+                                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>