diff options
| author | Michal Sekletar <msekletar@users.noreply.github.com> | 2019-05-30 12:32:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-30 12:32:53 +0200 |
| commit | 3f09629c2203e70446391e259dbc11a7ac0495d2 (patch) | |
| tree | 19d7ce1b6e22ceaae339eefcb462475cf0b2fe40 /man | |
| parent | a0267b30f8bd6ecdaa36e4195be4e34ffbacc581 (diff) | |
| parent | 1f57a176af5152d05719bf43740e87a47e37af50 (diff) | |
| download | systemd-3f09629c2203e70446391e259dbc11a7ac0495d2.tar.gz | |
Merge pull request #12628 from keszybz/dbus-execute
Rework cpu affinity parsing
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-system.conf.xml | 11 | ||||
| -rw-r--r-- | man/systemd.exec.xml | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 41baff8bfe..f5d419c519 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -96,10 +96,13 @@ <varlistentry> <term><varname>CPUAffinity=</varname></term> - <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 + <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> 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 |