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=28e50359f3fdaf35b097d9e38717e499e8892577;hb=d87be9b0af81a6e07d4fb3028e45c4409100dc26;hpb=0f0dbc46ccf5aaaf3131446d0a4d78bc97a37295

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 28e50359f..1f7d74e27 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -93,9 +93,12 @@
                 container.</para>
 
                 <para>Use a tool like
-                <citerefentry><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry> or <citerefentry><refentrytitle>mock</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <citerefentry><refentrytitle>yum</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                or
+                <citerefentry><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                 to set up an OS directory tree suitable as file system
-                hierarchy for <command>systemd-nspawn</command> containers.</para>
+                hierarchy for <command>systemd-nspawn</command>
+                containers.</para>
 
                 <para>Note that <command>systemd-nspawn</command> will
                 mount file systems private to the container to
@@ -111,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>
@@ -164,6 +172,17 @@
                                 </para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--uuid=</option></term>
+
+                                <listitem><para>Set the specified uuid
+                                for the container. The init system
+                                will initialize
+                                <filename>/etc/machine-id</filename>
+                                from this if this file is not set yet.
+                                </para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>--controllers=</option></term>
                                 <term><option>-C</option></term>
@@ -184,6 +203,86 @@
                                 loopback device.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--read-only</option></term>
+
+                                <listitem><para>Mount the root file
+                                system read only for the
+                                container.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--capability=</option></term>
+
+                                <listitem><para>List one or more
+                                additional capabilities to grant the
+                                container. Takes a comma separated
+                                list of capability names, see
+                                <citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+                                for more information. Note that the
+                                the following capabilities will be
+                                granted in any way: CAP_CHOWN,
+                                CAP_DAC_OVERRIDE, CAP_DAC_READ_SEARCH,
+                                CAP_FOWNER, CAP_FSETID, CAP_IPC_OWNER,
+                                CAP_KILL, CAP_LEASE,
+                                CAP_LINUX_IMMUTABLE,
+                                CAP_NET_BIND_SERVICE,
+                                CAP_NET_BROADCAST, CAP_NET_RAW,
+                                CAP_SETGID, CAP_SETFCAP, CAP_SETPCAP,
+                                CAP_SETUID, CAP_SYS_ADMIN,
+                                CAP_SYS_CHROOT, CAP_SYS_NICE,
+                                CAP_SYS_PTRACE, CAP_SYS_TTY_CONFIG,
+                                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>
@@ -191,27 +290,25 @@
         <refsect1>
                 <title>Example 1</title>
 
-                <programlisting># debootstrap --arch=amd64 unstable debian-tree/
-# systemd-nspawn -D debian-tree/</programlisting>
-
-                <para>This installs a minimal Debian unstable
-                distribution into the directory
-                <filename>debian-tree/</filename> and then spawns a
-                shell in a namespace container in it.</para>
+                <programlisting># yum --releasever=17 --nogpgcheck --installroot ~/fedora-tree/ install yum passwd vim-minimal rootfiles systemd
+# systemd-nspawn -D ~/fedora-tree /usr/lib/systemd/systemd</programlisting>
 
+                <para>This installs a minimal Fedora distribution into
+                the directory <filename>~/fedora-tree/</filename>
+                and then boots an OS in a namespace container in it,
+                with systemd as init system.</para>
         </refsect1>
 
         <refsect1>
                 <title>Example 2</title>
 
-                <programlisting># mock --init
-# systemd-nspawn -D /var/lib/mock/fedora-rawhide-x86_64/root/ /sbin/init systemd.log_level=debug</programlisting>
+                <programlisting># debootstrap --arch=amd64 unstable ~/debian-tree/
+# systemd-nspawn -D ~/debian-tree/</programlisting>
 
-                <para>This installs a minimal Fedora distribution into
-                a subdirectory of <filename>/var/lib/mock/</filename>
-                and then boots an OS in a namespace container in it,
-                with systemd as init system, configured for debug
-                logging.</para>
+                <para>This installs a minimal Debian unstable
+                distribution into the directory
+                <filename>~/debian-tree/</filename> and then spawns a
+                shell in a namespace container in it.</para>
 
         </refsect1>
 
@@ -227,8 +324,8 @@
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>chroot</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>mock</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                        <citerefentry><refentrytitle>yum</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                 </para>
         </refsect1>