diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-05-24 08:35:51 +0200 |
---|---|---|
committer | The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com> | 2019-12-05 15:17:20 +0100 |
commit | 8bf8409c6e08f5aef35d1976e172b3f61b651c8d (patch) | |
tree | 639dc403eab3c5966f03478d1cbc3e7dedf07f08 /man | |
parent | 69541e93c45efb7ee15d7584c3aa70c3ff0b2200 (diff) | |
download | systemd-8bf8409c6e08f5aef35d1976e172b3f61b651c8d.tar.gz |
pid1: parse CPUAffinity= in incremental fashion
This makes the handling of this option match what we do in unit files. I think
consistency is important here. (As it happens, it is the only option in
system.conf that is "non-atomic", i.e. where there's a list of things which can
be split over multiple assignments. All other options are single-valued, so
there's no issue of how to handle multiple assignments.)
(cherry picked from commit 61fbbac1d517a0b3498a689c736c6ca918497904)
Related: #1734787
Diffstat (limited to 'man')
-rw-r--r-- | man/systemd-system.conf.xml | 13 | ||||
-rw-r--r-- | man/systemd.exec.xml | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 085086200a..ab23779ec0 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -99,11 +99,14 @@ <varlistentry> <term><varname>CPUAffinity=</varname></term> - <listitem><para>Configures the initial CPU affinity for the - init process. Takes a list of CPU indices or ranges separated - by either whitespace or commas. CPU ranges are specified by - the lower and upper CPU indices separated by a - dash.</para></listitem> + <listitem><para>Configures the CPU affinity for the service manager as well as the default CPU + affinity for all forked off processes. Takes a list of CPU indices or ranges separated by either + whitespace or commas. CPU ranges are specified by the lower and upper CPU indices separated by a + dash. This option may be specified more than once, in which case the specified CPU affinity masks are + merged. If the empty string is assigned, the mask is reset, all assignments prior to this will have + no effect. Individual services may override the CPU affinity for their processes with the + <varname>CPUAffinity=</varname> setting in unit files, see + <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 737c52bcc4..342b8385bc 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -703,7 +703,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting> <listitem><para>Controls the CPU affinity of the executed processes. Takes a list of CPU indices or ranges separated by either whitespace or commas. CPU ranges are specified by the lower and upper CPU indices separated - by a dash. This option may be specified more than once, in which case the specified CPU affinity masks are + by a dash. This option may be specified more than once, in which case the specified CPU affinity masks are merged. If the empty string is assigned, the mask is reset, all assignments prior to this will have no effect. See <citerefentry><refentrytitle>sched_setaffinity</refentrytitle><manvolnum>2</manvolnum></citerefentry> for |