diff options
| author | Anita Zhang <the.anitazha@gmail.com> | 2020-03-04 17:31:36 -0800 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-03-05 13:53:29 +0900 |
| commit | 5403e153372e4001820a0e403b6448d81e7e3c05 (patch) | |
| tree | 4657d7bd3402ad39fed7f14a27324e24c2123494 | |
| parent | a3558e795203230837fb3afc64102fa501b001d4 (diff) | |
| download | systemd-5403e153372e4001820a0e403b6448d81e7e3c05.tar.gz | |
man: update list of supported controllers
| -rw-r--r-- | man/supported-controllers.xml | 14 | ||||
| -rw-r--r-- | man/systemd.resource-control.xml | 11 |
2 files changed, 19 insertions, 6 deletions
diff --git a/man/supported-controllers.xml b/man/supported-controllers.xml new file mode 100644 index 0000000000..15e048b12d --- /dev/null +++ b/man/supported-controllers.xml @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> + +<!-- + SPDX-License-Identifier: LGPL-2.1+ +--> + +<refsect1> + +<para id="controllers-text">The following controller names may be specified: <option>cpu</option>, <option>cpuacct</option>, +<option>cpuset</option>, <option>io</option>, <option>blkio</option>, <option>memory</option>, <option>devices</option>, +<option>pids</option>, <option>bpf-firewall</option>, and <option>bpf-devices</option>.</para> + +</refsect1> diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index fce7dc7505..7e116f8e83 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- SPDX-License-Identifier: LGPL-2.1+ --> -<refentry id="systemd.resource-control"> +<refentry id="systemd.resource-control" xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> <title>systemd.resource-control</title> <productname>systemd</productname> @@ -847,9 +847,9 @@ DeviceAllow=/dev/loop-control hierarchy. Accordingly, access to the specified controllers will not be granted to unprivileged services on the legacy hierarchy, even when requested.</para> - <para>The following controller names may be specified: <option>cpu</option>, <option>cpuacct</option>, - <option>io</option>, <option>blkio</option>, <option>memory</option>, <option>devices</option>, - <option>pids</option>. Not all of these controllers are available on all kernels however, and some are + <xi:include href="supported-controllers.xml" xpointer="controllers-text" /> + + <para>Not all of these controllers are available on all kernels however, and some are specific to the unified hierarchy while others are specific to the legacy hierarchy. Also note that the kernel might support further controllers, which aren't covered here yet as delegation is either not supported at all for them or not defined cleanly.</para> @@ -876,8 +876,7 @@ DeviceAllow=/dev/loop-control to disable. Passing <varname>DisableControllers=</varname> by itself with no controller name present resets the disabled controller list.</para> - <para>Valid controllers are <option>cpu</option>, <option>cpuacct</option>, <option>io</option>, - <option>blkio</option>, <option>memory</option>, <option>devices</option>, and <option>pids</option>.</para> + <xi:include href="supported-controllers.xml" xpointer="controllers-text" /> </listitem> </varlistentry> </variablelist> |