summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-02-09 01:20:09 +0100
committerLennart Poettering <lennart@poettering.net>2012-02-09 01:20:09 +0100
commitfa4ab99705fb1484c7b7cda8356594210e245de0 (patch)
tree50e5a66fa9ca6a9e13218fd0959dc7fa847d6847 /man
parentb13df9644bc6d4823b5a84e8a6bbf3bbb2c207c2 (diff)
man: document x-systemd-device-timeout=
Diffstat (limited to 'man')
-rw-r--r--man/systemd.mount.xml23
1 files changed, 16 insertions, 7 deletions
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index d397c896da..1986784947 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -99,7 +99,7 @@
</refsect1>
<refsect1>
- <title><filename>fstab</filename></title>
+ <title><filename>/etc/fstab</filename></title>
<para>Mount units may either be configured via unit
files, or via <filename>/etc/fstab</filename> (see
@@ -110,16 +110,25 @@
few special mount options are understood by systemd
which influence how dependencies are created for mount
points from <filename>/etc/fstab</filename>. If
- <option>comment=systemd.mount</option> is specified as
- mount option, then systemd will create a dependency of
- type <option>Wants</option> from either
+ <option>x-systemd.mount</option> is specified as mount
+ option, then systemd will create a dependency of type
+ <option>Wants</option> from either
<filename>local-fs.target</filename> or
<filename>remote-fs.target</filename>, depending
whether the file system is local or remote. If
- <option>comment=systemd.automount</option> is set, an
- automount unit will be created for the file system. See
+ <option>x-systemd.automount</option> is set, an
+ automount unit will be created for the file
+ system. See
<citerefentry><refentrytitle>systemd.automount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
- for details.</para>
+ for details. If
+ <option>x-systemd-device-timeout=</option> is
+ specified it may be used to configure how long systemd
+ should wait for a device to show up before giving up
+ on an entry from
+ <filename>/etc/fstab</filename>. Specify a time in
+ seconds or explicitly specifiy a unit as
+ <literal>s</literal>, <literal>min</literal>,
+ <literal>h</literal>, <literal>ms</literal>.</para>
<para>If a mount point is configured in both
<filename>/etc/fstab</filename> and a unit file, the