aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2016-11-11 15:08:57 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-11-11 09:08:57 -0500
commit110773f6c934c37f058d273ee55cf2fd0010b329 (patch)
tree5f49049d2a10a42245e78d55eeb3ff745fdb6469 /man/systemd.mount.xml
parenttest-nss: allow the module and names/addresses to be specified (#4258) (diff)
downloadsystemd-110773f6c934c37f058d273ee55cf2fd0010b329.tar.gz
systemd-110773f6c934c37f058d273ee55cf2fd0010b329.tar.bz2
systemd-110773f6c934c37f058d273ee55cf2fd0010b329.zip
fstab-generator: add x-systemd.mount-timeout (#4603)
This adds a new systemd fstab option x-systemd.mount-timeout. The option adds a timeout value that specifies how long systemd waits for the mount command to finish. It allows to mount huge btrfs volumes without issues. This is equivalent to adding option TimeoutSec= to [Mount] section in a mount unit file. fixes #4055
Diffstat (limited to 'man/systemd.mount.xml')
-rw-r--r--man/systemd.mount.xml19
1 files changed, 19 insertions, 0 deletions
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index b0f156f6d..68ff6f8f1 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -241,6 +241,25 @@
</varlistentry>
<varlistentry>
+ <term><option>x-systemd.mount-timeout=</option></term>
+
+ <listitem><para>Configure how long systemd should wait for the
+ mount command to finish before giving up on an entry from
+ <filename>/etc/fstab</filename>. Specify a time in seconds or
+ explicitly append a unit such as <literal>s</literal>,
+ <literal>min</literal>, <literal>h</literal>,
+ <literal>ms</literal>.</para>
+
+ <para>Note that this option can only be used in
+ <filename>/etc/fstab</filename>, and will be
+ ignored when part of the <varname>Options=</varname>
+ setting in a unit file.</para>
+
+ <para>See <varname>TimeoutSec=</varname> below for
+ details.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><option>noauto</option></term>
<term><option>auto</option></term>