X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=2352b6a8fe15fad7ed4fd19bc1b9b7bf9c3f5d3a;hb=8f33b5b8b3e85f9c3b00eb004e601f7a72fa6461;hp=c7045e84220a2f61c6b20ffcd1864afa6f742942;hpb=ba035df230e41bf9d70ebb47915c9472b7884412;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index c7045e842..2352b6a8f 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -9,16 +9,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -99,7 +99,7 @@
- fstab
+ /etc/fstabMount units may either be configured via unit
files, or via /etc/fstab (see
@@ -110,16 +110,27 @@
few special mount options are understood by systemd
which influence how dependencies are created for mount
points from /etc/fstab. If
- is specified as
- mount option, then systemd will create a dependency of
- type from either
+ is set in
+ system.conf (which is the
+ default), or if is
+ specified as mount option, then systemd will create a
+ dependency of type from either
local-fs.target or
remote-fs.target, depending
whether the file system is local or remote. If
- is set, an
- automount unit will be created for the file system. See
+ is set, an
+ automount unit will be created for the file
+ system. See
systemd.automount5
- for details.
+ for details. If
+ 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
+ /etc/fstab. Specify a time in
+ seconds or explicitly specifiy a unit as
+ s, min,
+ h, ms.
If a mount point is configured in both
/etc/fstab and a unit file, the
@@ -212,7 +223,7 @@
a time span value such as "5min
20s". Pass 0 to disable the timeout
logic. Defaults to
- 60s.
+ 90s.
@@ -221,7 +232,6 @@
processes of this mount shall be
killed. One of
,
- ,
,
.