summaryrefslogtreecommitdiffstats
path: root/man/systemd-fstab-generator.xml
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@gmail.com>2014-10-09 21:37:17 +0200
committerLennart Poettering <lennart@poettering.net>2014-10-10 12:57:19 +0200
commit9f103625b145a397e67c3714766775b615c8b587 (patch)
tree0cfca8df572966cf083957a073fc07fb410b2e61 /man/systemd-fstab-generator.xml
parentkdbus: fix buffer overflow in bus_get_owner_kdbus() function (diff)
downloadsystemd-9f103625b145a397e67c3714766775b615c8b587.tar.xz
systemd-9f103625b145a397e67c3714766775b615c8b587.zip
fstab-generator: Honor mount.usr*= on kernel command line
This allows to configure boot loader entries for systems where the root and usr filesystems are in different subvolumes (or even on different drives).
Diffstat (limited to 'man/systemd-fstab-generator.xml')
-rw-r--r--man/systemd-fstab-generator.xml76
1 files changed, 75 insertions, 1 deletions
diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
index e3cf5d2bfb..65b48eea07 100644
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.xml
@@ -104,9 +104,83 @@
(initrd) while
<varname>fstab=</varname> is
honored by both the main system and
- the initrd. </para></listitem>
+ 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>