X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=657cf11be36bcc0ae056cba23f7f97717718d8c3;hb=e4e703c3076cb5060ab401a2370ab84883f2fd8f;hp=1986784947dd9a99c8e355e3445e9794a8667ad3;hpb=fa4ab99705fb1484c7b7cda8356594210e245de0;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 198678494..657cf11be 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 .
-->
@@ -44,18 +44,18 @@
systemd.mount
- systemd mount configuration files
+ Mount unit configuration
- systemd.mount
+ mount.mountDescriptionA unit configuration file whose name ends in
- .mount encodes information about
+ .mount encodes information about
a file system mount point controlled and supervised by
systemd.
@@ -72,15 +72,29 @@
systemd.exec5,
which define the execution environment the
mount8
- binary is executed in.
+ binary is executed in, and in
+ systemd.kill5,
+ which define the way the processes are terminated, and
+ in
+ systemd.resource-control5,
+ which configure resource control settings for the
+ processes of the service. Note that the User= and
+ Group= options are not particularly useful for mount
+ units specifying a Type= option or
+ using configuration not specified in
+ /etc/fstab;
+ mount8
+ will refuse options that are not listed in
+ /etc/fstab if it is not run as
+ UID 0.
Mount units must be named after the mount point
directories they control. Example: the mount point
- /home/lennart must be configured
+ /home/lennart must be configured
in a unit file
home-lennart.mount. For details
about the escaping logic used to convert a file system
- path to a unit name see
+ path to a unit name, see
systemd.unit5.Optionally, a mount unit may be accompanied by
@@ -88,14 +102,25 @@
mounting. See
systemd.automount5.
- If an mount point is beneath another mount point
+ If a mount point is beneath another mount point
in the file system hierarchy, a dependency between both
units is created automatically.
- Mount points created at runtime independent on
- unit files or /etc/fstab will be
+ Mount points created at runtime (independently of
+ unit files or /etc/fstab) will be
monitored by systemd and appear like any other mount
- unit in systemd.
+ unit in systemd.
+ See /proc/self/mountinfo description
+ in proc5.
+
+
+ Some file systems have special semantics as API
+ file systems for kernel-to-userspace and
+ userspace-to-userpace interfaces. Some of them may not
+ be changed via mount units, and cannot be disabled.
+ For a longer discussion see API
+ File Systems.
@@ -104,14 +129,21 @@
Mount units may either be configured via unit
files, or via /etc/fstab (see
fstab5
- for details).
+ for details). Mounts listed in
+ /etc/fstab will be converted into
+ native units dynamically at boot and when the
+ configuration of the system manager is reloaded. In
+ general, configuring mount points through
+ /etc/fstab is the preferred
+ approach. See
+ systemd-fstab-generator8
+ for details about the conversion.
When reading /etc/fstab a
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
+ points from /etc/fstab. systemd
+ will create a dependency of type
from either
local-fs.target or
remote-fs.target, depending
@@ -121,18 +153,41 @@
system. See
systemd.automount5
for details. If
- is
- specified it may be used to configure how long systemd
+ 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
+ seconds or explicitly specify a unit as
s, min,
h, ms.
+ If is given, this mount
+ will be only wanted, not required, by the
+ local-fs.target. This means that
+ the boot will continue even if this mount point is not
+ mounted successfully. Option has
+ the opposite meaning and is the default.
+
+ If is given, this mount
+ will not be added as a dependency for
+ local-fs.target. This means that
+ it will not be mounted automatically during boot,
+ unless it is pulled in by some other unit. Option
+ has the opposite meaning and is
+ the default.
+
If a mount point is configured in both
- /etc/fstab and a unit file, the
- configuration in the latter takes precedence.
+ /etc/fstab and a unit file that
+ is stored below /usr, the former
+ will take precedence. If the unit file is stored below
+ /etc, it will take
+ precedence. This means: native unit files take
+ precedence over traditional configuration files, but
+ this is superseded by the rule that configuration in
+ /etc will always take precedence
+ over configuration in
+ /usr.
@@ -143,11 +198,13 @@
supervises. A number of options that may be used in
this section are shared with other unit types. These
options are documented in
- systemd.exec5. The
+ systemd.exec5
+ and
+ systemd.kill5. The
options specific to the [Mount] section of mount
units are the following:
-
+ What=
@@ -168,17 +225,17 @@
Where=Takes an absolute path
of a directory of the mount point. If
- the mount point is not existing at
+ the mount point does not exist at the
time of mounting, it is created. This
string must be reflected in the unit
- file name. (See above.) This option is
+ filename. (See above.) This option is
mandatory.Type=Takes a string for the
- filesystem type. See
+ file system type. See
mount8
for details. This setting is
optional.
@@ -188,8 +245,8 @@
Options=Mount options to use
- when mounting. This takes a comma
- separated list of options. This
+ when mounting. This takes a
+ comma-separated list of options. This
setting is optional.
@@ -210,55 +267,27 @@
Configures the time to
wait for the mount command to
finish. If a command does not exit
- within the configured time the mount
+ within the configured time, the mount
will be considered failed and be shut
down again. All commands still running
will be terminated forcibly via
- SIGTERM, and after another delay of
- this time with SIGKILL. (See
- below.)
+ SIGTERM, and after another delay of
+ this time with SIGKILL. (See
+ in
+ systemd.kill5.)
Takes a unit-less value in seconds, or
a time span value such as "5min
20s". Pass 0 to disable the timeout
- logic. Defaults to
- 90s.
-
-
-
- KillMode=
- Specifies how
- processes of this mount shall be
- killed. One of
- ,
- ,
- .
-
- This option is mostly equivalent
- to the
- option of service files. See
- systemd.service5
- for details.
-
-
-
- KillSignal=
- Specifies which signal
- to use when killing a process of this
- mount. Defaults to SIGTERM.
-
-
-
-
- SendSIGKILL=
- Specifies whether to
- send SIGKILL to remaining processes
- after a timeout, if the normal
- shutdown procedure left processes of
- the mount around. Takes a boolean
- value. Defaults to "yes".
-
+ logic. The default value is set from the manager configuration
+ file's DefaultTimeoutStart= variable.
+
+ Check
+ systemd.exec5
+ and
+ systemd.kill5
+ for more settings.
@@ -268,8 +297,14 @@
systemctl8,
systemd.unit5,
systemd.exec5,
+ systemd.kill5,
+ systemd.resource-control5,
+ systemd.service5,
systemd.device5,
- mount8
+ proc5,
+ mount8,
+ systemd-fstab-generator8,
+ systemd.directives7