diff options
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | man/systemd.exec.xml | 16 | ||||
| -rw-r--r-- | man/systemd.mount.xml | 9 | ||||
| -rw-r--r-- | man/systemd.service.xml | 14 | ||||
| -rw-r--r-- | man/systemd.socket.xml | 8 | ||||
| -rw-r--r-- | man/systemd.swap.xml | 53 | ||||
| -rw-r--r-- | src/load-fragment.c | 2 |
7 files changed, 96 insertions, 10 deletions
@@ -1,3 +1,7 @@ +* reload PID file after reload, allow dynamically changing main PIDs + +* Fix multiple reload statements + * FAT uuids are uppercase, systemd refers to them in lowercase, breakage (mjg59) * make usage of SIGKILL when shutting down services optional diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index d6ac5aed89..835ee81531 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -50,29 +50,32 @@ <refsynopsisdiv> <para><filename>systemd.service</filename>, <filename>systemd.socket</filename>, - <filename>systemd.mount</filename></para> + <filename>systemd.mount</filename>, + <filename>systemd.swap</filename></para> </refsynopsisdiv> <refsect1> <title>Description</title> <para>Unit configuration files for services, sockets - and mount points share a subset of configuration - options which define the execution environment of - spawned processes.</para> + mount points and swap devices share a subset of + configuration options which define the execution + environment of spawned processes.</para> <para>This man page lists the configuration options shared by these three unit types. See <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry> for the common options of all unit configuration files, and - <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry> + <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.swap</refentrytitle><manvolnum>5</manvolnum></citerefentry> and <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry> for more information on the specific unit configuration files. The execution specific configuration options are configured in the [Service], - [Socket] resp. [Mount] section, depending on the unit + [Socket], [Mount] resp. [Swap] section, depending on the unit type.</para> </refsect1> @@ -766,6 +769,7 @@ <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.swap</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry> </para> </refsect1> diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index 323f232878..e2a9f2272d 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -231,6 +231,15 @@ <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details.</para></listitem> </varlistentry> + + <varlistentry> + <term><varname>KillSignal=</varname></term> + <listitem><para>Specifies which signal + to use when killing a process of this + mount. Defaults to SIGTERM. + </para></listitem> + </varlistentry> + </variablelist> </refsect1> diff --git a/man/systemd.service.xml b/man/systemd.service.xml index e4fa6bcc7c..e5262f6d60 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -560,8 +560,10 @@ <option>control-group</option>.</para> <para>Processes will first be - terminated via SIGTERM. If then after - a delay (configured via the + terminated via SIGTERM (unless this is + changed via + <varname>KillSignal=</varname>). If + then after a delay (configured via the <varname>TimeoutSec=</varname> option) processes still remain, the termination request is repeated with @@ -572,6 +574,14 @@ </varlistentry> <varlistentry> + <term><varname>KillSignal=</varname></term> + <listitem><para>Specifies which signal + to use when killing a + service. Defaults to SIGTERM. + </para></listitem> + </varlistentry> + + <varlistentry> <term><varname>NonBlocking=</varname></term> <listitem><para>Set O_NONBLOCK flag for all file descriptors passed via diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 78d379de92..47ad913748 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -520,6 +520,14 @@ </varlistentry> <varlistentry> + <term><varname>KillSignal=</varname></term> + <listitem><para>Specifies which signal + to use when killing a process of this + socket. Defaults to SIGTERM. + </para></listitem> + </varlistentry> + + <varlistentry> <term><varname>Service=</varname></term> <listitem><para>Specifies the service unit name to activate on incoming diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 38574ab4c8..45467039e9 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -95,8 +95,12 @@ <para>Swap files must include a [Swap] section, which carries information about the swap device it - supervises. The options specific to the [Swap] section - of swap units are the following:</para> + supervises. A number of options that may be used in + this section are shared with other unit types. These + options are documented in + <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>. The + options specific to the [Swap] section of swap units + are the following:</para> <variablelist> @@ -128,6 +132,50 @@ file. This takes an integer. This setting is optional.</para></listitem> </varlistentry> + + <varlistentry> + <term><varname>TimeoutSec=</varname></term> + <listitem><para>Configures the time to + wait for the swapon command to + finish. If a command does not exit + within the configured time the swap + 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 + <option>KillMode=</option> below.) + 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 + 60s.</para></listitem> + </varlistentry> + + <varlistentry> + <term><varname>KillMode=</varname></term> + <listitem><para>Specifies how + processes of this swap shall be + killed. One of + <option>control-group</option>, + <option>process-group</option>, + <option>process</option>, + <option>none</option>.</para> + + <para>This option is mostly equivalent + to the <option>KillMode=</option> + option of service files. See + <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> + for details.</para></listitem> + </varlistentry> + + <varlistentry> + <term><varname>KillSignal=</varname></term> + <listitem><para>Specifies which signal + to use when killing a process of this + swap. Defaults to SIGTERM. + </para></listitem> + </varlistentry> </variablelist> </refsect1> @@ -137,6 +185,7 @@ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.device</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry> diff --git a/src/load-fragment.c b/src/load-fragment.c index 261180d155..b7c3cbbc3b 100644 --- a/src/load-fragment.c +++ b/src/load-fragment.c @@ -1914,6 +1914,8 @@ static int load_from_path(Unit *u, const char *path) { { "What", config_parse_path, &u->swap.parameters_fragment.what, "Swap" }, { "Priority", config_parse_int, &u->swap.parameters_fragment.priority, "Swap" }, + { "TimeoutSec", config_parse_usec, &u->swap.timeout_usec, "Swap" }, + EXEC_CONTEXT_CONFIG_ITEMS(u->swap.exec_context, "Swap"), { "OnActiveSec", config_parse_timer, &u->timer, "Timer" }, { "OnBootSec", config_parse_timer, &u->timer, "Timer" }, |