summaryrefslogtreecommitdiffstats
path: root/man/systemd.exec.xml
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-05-24 08:35:51 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-05-29 10:29:28 +0200
commit61fbbac1d517a0b3498a689c736c6ca918497904 (patch)
tree5ee07403933b8dcc8db9cc34b91cc281b37e2dc2 /man/systemd.exec.xml
parenttest-cpu-set-util: add a smoke test for test_parse_cpu_set_extend() (diff)
downloadsystemd-61fbbac1d517a0b3498a689c736c6ca918497904.tar.xz
systemd-61fbbac1d517a0b3498a689c736c6ca918497904.zip
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.)
Diffstat (limited to 'man/systemd.exec.xml')
-rw-r--r--man/systemd.exec.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 719c2c5ff3..d65b842f44 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -754,7 +754,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