summaryrefslogtreecommitdiffstats
path: root/man/systemd-system.conf.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-07-23 11:05:40 +0200
committerLennart Poettering <lennart@poettering.net>2018-07-25 16:01:28 +0200
commitd68c0833eac6d46a3ed83f0ba7a049fe24291226 (patch)
treed945f286081a77bbd7fc5215913225c763619afa /man/systemd-system.conf.xml
parentcore/main: use return log_*_errno more (diff)
downloadsystemd-d68c0833eac6d46a3ed83f0ba7a049fe24291226.tar.xz
systemd-d68c0833eac6d46a3ed83f0ba7a049fe24291226.zip
man: document CPUAffinity= in system.conf in more detail
Fixes: #9692
Diffstat (limited to 'man/systemd-system.conf.xml')
-rw-r--r--man/systemd-system.conf.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 4cdd85f9ff..a9116ea08f 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -99,11 +99,11 @@
<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. 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>