diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-15 21:07:43 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-11-16 14:54:13 +0100 |
| commit | 143fadf369a18449464956206226761e49be1928 (patch) | |
| tree | 9ff2d69cbebfba21bb18465ae861556443bc159c /man | |
| parent | core: fix capitalization of CPUShares= settings (diff) | |
| download | systemd-143fadf369a18449464956206226761e49be1928.tar.xz systemd-143fadf369a18449464956206226761e49be1928.zip | |
core: remove JoinControllers= configuration setting
This removes the ability to configure which cgroup controllers to mount
together. Instead, we'll now hardcode that "cpu" and "cpuacct" are
mounted together as well as "net_cls" and "net_prio".
The concept of mounting controllers together has no future as it does
not exist to cgroupsv2. Moreover, the current logic is systematically
broken, as revealed by the discussions in #10507. Also, we surveyed Red
Hat customers and couldn't find a single user of the concept (which
isn't particularly surprising, as it is broken...)
This reduced the (already way too complex) cgroup handling for us, since
we now know whenever we make a change to a cgroup for one controller to
which other controllers it applies.
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-system.conf.xml | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 5ce2c6fb96..ea17111bc5 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -107,29 +107,6 @@ </varlistentry> <varlistentry> - <term><varname>JoinControllers=cpu,cpuacct net_cls,netprio</varname></term> - - <listitem><para>Configures controllers that shall be mounted - in a single hierarchy. By default, systemd will mount all - controllers which are enabled in the kernel in individual - hierarchies, with the exception of those listed in this - setting. Takes a space-separated list of comma-separated - controller names, in order to allow multiple joined - hierarchies. Defaults to 'cpu,cpuacct'. Pass an empty string - to ensure that systemd mounts all controllers in separate - hierarchies.</para> - - <para>Note that this option is only applied once, at very - early boot. If you use an initial RAM disk (initrd) that uses - systemd, it might hence be necessary to rebuild the initrd if - this option is changed, and make sure the new configuration - file is included in it. Otherwise, the initrd might mount the - controller hierarchies in a different configuration than - intended, and the main system cannot remount them - anymore.</para></listitem> - </varlistentry> - - <varlistentry> <term><varname>RuntimeWatchdogSec=</varname></term> <term><varname>ShutdownWatchdogSec=</varname></term> |