diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-gpt-auto-generator.xml | 15 | ||||
| -rw-r--r-- | man/systemd.kill.xml | 8 | ||||
| -rw-r--r-- | man/systemd.service.xml | 19 | ||||
| -rw-r--r-- | man/timesyncd.conf.xml | 4 |
4 files changed, 33 insertions, 13 deletions
diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml index 16ff100d73..d3e02d6f7b 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -64,13 +64,16 @@ <filename>/home</filename>, <filename>/srv</filename> and swap partitions and creates mount and swap units for them, based on the partition type GUIDs of GUID partition tables (GPT). It implements - the - <ulink url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable + the <ulink + url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable Partitions Specification</ulink>. Note that this generator has no - effect on non-GPT systems, on systems where the units are - explicitly configured (for example, listed in - <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>), - or where the mount points are non-empty.</para> + effect on non-GPT systems, or where the directories under the + mount points are already non-empty. Also, on systems where the + units are explicitly configured (for example, listed in + <citerefentry + project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>), + the units this generator creates are overriden, but additional + automatic dependencies might be created.</para> <para>This generator will only look for root partitions on the same physical disk the EFI System Partition (ESP) is located on. diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml index ef828e081c..c51cf81320 100644 --- a/man/systemd.kill.xml +++ b/man/systemd.kill.xml @@ -139,7 +139,13 @@ by <constant>SIGKILL</constant> (see above and below). For a list of valid signals, see <citerefentry project='man-pages'><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>. - Defaults to <constant>SIGTERM</constant>. </para></listitem> + Defaults to <constant>SIGTERM</constant>. </para> + + <para>Note that right after sending the signal specified in + this setting systemd will always send + <constant>SIGCONT</constant>, to ensure that even suspended + tasks can be terminated cleanly.</para> + </listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 0fe694ab7e..e26196323d 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -383,10 +383,21 @@ run, all processes remaining for a service are terminated according to the <varname>KillMode=</varname> setting (see <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>). - If this option is not specified, the process is terminated - immediately when service stop is requested. Specifier and - environment variable substitution is supported (including - <varname>$MAINPID</varname>, see above).</para></listitem> + If this option is not specified, the process is terminated by + sending the signal specified in <varname>KillSignal=</varname> + when service stop is requested. Specifier and environment + variable substitution is supported (including + <varname>$MAINPID</varname>, see above).</para> + + <para>Note that it is usually not sufficient to specify a + command for this setting that only asks the service to + terminate (for example by queuing some form of termination + signal for it), but does not wait for it to do so. Since the + remaining processes of the services are killed using + <constant>SIGKILL</constant> immediately after the command + exited this would not result in a clean stop. The specified + command should hence be a synchronous operation, not an + asynchronous one.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml index c297d3254c..ee054f9ef1 100644 --- a/man/timesyncd.conf.xml +++ b/man/timesyncd.conf.xml @@ -75,13 +75,13 @@ <varlistentry> <term><varname>NTP=</varname></term> - <listitem><para>A space separated list of NTP servers host + <listitem><para>A space separated list of NTP server host names or IP addresses. During runtime this list is combined with any per-interface NTP servers acquired from <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. systemd-timesyncd will contact all configured system or per-interface servers in turn until one is found that - responds. This setting defaults to the empty + responds. This setting defaults to an empty list.</para></listitem> </varlistentry> |