X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-fstab-generator.xml;h=65b48eea0787237ac293769aa847f3f44c8c2d4d;hp=a526bcfdb24bb1b3c95f22c21cf24c0494ffe604;hb=b16492f86f13abd4a9447afd0910139af9656906;hpb=059b37cc288ab529c6b5033af1f8118914f0329f

diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
index a526bcfdb..65b48eea0 100644
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.xml
@@ -42,7 +42,7 @@
 
         <refnamediv>
                 <refname>systemd-fstab-generator</refname>
-                <refpurpose>Unit generator for <filename>/etc/fstab</filename></refpurpose>
+                <refpurpose>Unit generator for /etc/fstab</refpurpose>
         </refnamediv>
 
         <refsynopsisdiv>
@@ -59,7 +59,13 @@
                 for details) into native systemd units early at boot
                 and when configuration of the system manager is
                 reloaded. This will instantiate mount and swap units
-                units as necessary.</para>
+                as necessary.</para>
+
+                <para>The <varname>passno</varname> field is treated
+                like a simple boolean, and the ordering information is
+                discarded. However, if the root file system is
+                checked, it is checked before all the other
+                file systems.</para>
 
                 <para>See
                 <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
@@ -71,7 +77,7 @@
 
                 <para><filename>systemd-fstab-generator</filename>
                 implements the <ulink
-                url="http://www.freedesktop.org/wiki/Software/systemd/Generator">generator
+                url="http://www.freedesktop.org/wiki/Software/systemd/Generators">generator
                 specification</ulink>.</para>
         </refsect1>
 
@@ -81,7 +87,7 @@
                 <para><filename>systemd-fstab-generator</filename> understands
                 the following kernel command line parameters:</para>
 
-                <variablelist>
+                <variablelist class='kernel-commandline-options'>
 
                         <varlistentry>
                                 <term><varname>fstab=</varname></term>
@@ -90,17 +96,91 @@
                                 <listitem><para>Takes a boolean
                                 argument. Defaults to
                                 <literal>yes</literal>. If
-                                <literal>no</literal> causes the
+                                <literal>no</literal>, causes the
                                 generator to ignore any mounts or swaps
                                 configured in
                                 <filename>/etc/fstab</filename>. <varname>rd.fstab=</varname>
-                                is honoured only be initial RAM disk
+                                is honored only by initial RAM disk
                                 (initrd) while
-                                <varname>luks.fstab=</varname> is
-                                honoured by both the main system and
-                                the initrd.  </para></listitem>
+                                <varname>fstab=</varname> is
+                                honored by both the main system and
+                                the initrd.</para></listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><varname>root=</varname></term>
+
+                                <listitem><para>Takes the root filesystem to mount
+                                in the initrd.
+                                <varname>root=</varname> is
+                                honored by the initrd.</para></listitem>
                         </varlistentry>
+                        <varlistentry>
+                                <term><varname>rootfstype=</varname></term>
 
+                                <listitem><para>Takes the root filesystem type that
+                                will be passed to the mount command.
+                                <varname>rootfstype=</varname> is
+                                honored by the initrd.</para></listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><varname>rootflags=</varname></term>
+
+                                <listitem><para>Takes the root filesystem mount options
+                                to use. <varname>rootflags=</varname> is
+                                honored by the initrd.</para></listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><varname>mount.usr=</varname></term>
+
+                                <listitem><para>Takes the <filename>/usr</filename>
+                                filesystem to be mounted by the initrd. If
+                                <varname>mount.usrfstype=</varname> or
+                                <varname>mount.usrflags=</varname> is set, then
+                                <varname>mount.usr=</varname> will default to the value set in
+                                <varname>root=</varname>.</para>
+
+                                <para>Otherwise this parameter defaults to the
+                                <filename>/usr</filename> entry
+                                found in <filename>/etc/fstab</filename> on the root
+                                filesystem.</para>
+
+                                <para><varname>mount.usr=</varname> is honored by the initrd.
+                                </para></listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><varname>mount.usrfstype=</varname></term>
+
+                                <listitem><para>Takes the <filename>/usr</filename>
+                                filesystem type that will be passed to the mount
+                                command. If <varname>mount.usr=</varname> or
+                                <varname>mount.usrflags=</varname> is set, then
+                                <varname>mount.usrfstype=</varname> will default to the value set in
+                                <varname>rootfstype=</varname>.</para>
+
+                                <para>Otherwise this value will be read from the
+                                <filename>/usr</filename> entry in
+                                <filename>/etc/fstab</filename> on the root filesystem.</para>
+
+                                <para><varname>mount.usrfstype=</varname> is
+                                honored by the initrd.</para></listitem>
+                        </varlistentry>
+                        <varlistentry>
+                                <term><varname>mount.usrflags=</varname></term>
+
+                                <listitem><para>Takes the <filename>/usr</filename>
+                                filesystem mount options to use. If
+                                <varname>mount.usr=</varname> or
+                                <varname>mount.usrfstype=</varname> is set, then
+                                <varname>mount.usrflages=</varname> will default to the value set in
+                                <varname>rootflags=</varname>.</para>
+
+                                <para>Otherwise this value will be read from the
+                                <filename>/usr</filename> entry in
+                                <filename>/etc/fstab</filename> on the root filesystem.</para>
+
+                                <para><varname>mount.usrflags=</varname> is
+                                honored by the initrd.</para></listitem>
+                        </varlistentry>
                 </variablelist>
         </refsect1>