diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-16 17:53:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-16 17:53:26 +0100 |
| commit | 6415fecd4cd9903947804b0c36aa9967b24f6878 (patch) | |
| tree | e5d77a63924a5385d1bfbd18021074bc3e4cec28 /man | |
| parent | Merge pull request #10802 from poettering/hide-only-on (diff) | |
| parent | update TODO (diff) | |
| download | systemd-6415fecd4cd9903947804b0c36aa9967b24f6878.tar.xz systemd-6415fecd4cd9903947804b0c36aa9967b24f6878.zip | |
Merge pull request #10785 from poettering/cgroup-join-removal
remove JoinControllers= setting
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> |