X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=48af1caaceaae4385667867f9cc3505856e15575;hp=d47fb93669cc2bb74a665c6264c8ff4a7bcd62bb;hb=3fde5f30bda2a70d97f3dc8fa918e42e1c07cc2c;hpb=e9dd9f9547350c7dc0473583b5c2228dc8f0ab76 diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index d47fb9366..48af1caac 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -55,7 +55,7 @@ Description A 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. @@ -73,14 +73,18 @@ which define the execution environment the mount8 binary is executed in, and in - systemd.kill5 - which define the way the processes are - terminated. 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; + 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 aren't listed in + will refuse options that are not listed in /etc/fstab if it is not run as UID 0. @@ -147,7 +151,7 @@ systemd.automount5 for details. If is - specified it may be used to configure how long systemd + 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 @@ -157,9 +161,9 @@ If a mount point is configured in both /etc/fstab and a unit file that - is stored below /usr the former + is stored below /usr, the former will take precedence. If the unit file is stored below - /etc it will take + /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 @@ -249,8 +253,8 @@ 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 + SIGTERM, and after another delay of + this time with SIGKILL. (See in systemd.kill5.) Takes a unit-less value in seconds, or @@ -298,6 +302,7 @@ systemd.unit5, systemd.exec5, systemd.kill5, + systemd.resource-control5, systemd.service5, systemd.device5, proc5,