Commit bb339e78 authored by Michael Biebl's avatar Michael Biebl

Update links to kernel.org cgroup documentation

The systemd.resource-control man page had references to /cgroups/ which
moved to /cgroup-v1/.

Closes: #819970
parent 67ee56fc
......@@ -8,6 +8,9 @@ systemd (215-17+deb8u5) UNRELEASED; urgency=medium
Otherwise a disabled event source can get swapped with an enabled one
and cause a severe sd-event malfunction, breaking the event loop.
(Closes: #789796)
* Update links to kernel.org cgroup documentation.
The systemd.resource-control man page had references to /cgroups/ which
moved to /cgroup-v1/. (Closes: #819970)
-- Michael Biebl <biebl@debian.org> Fri, 01 Jul 2016 17:35:05 +0200
......
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 5 Apr 2016 10:48:06 +0200
Subject: man: update links to kernel.org cgroup documentation
This recently moved from /cgroups/ to /cgroup-v1/.
Fixes #2958
(cherry-picked from commit c51fa94772d85f2a2442d6bcecb5efc4c102ff34)
---
man/systemd.resource-control.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index e91c260..19c6d85 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -191,7 +191,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<literal>memory.limit_in_bytes</literal> control group
attribute. For details about this control group attribute,
see <ulink
- url="https://www.kernel.org/doc/Documentation/cgroups/memory.txt">memory.txt</ulink>.</para>
+ url="https://www.kernel.org/doc/Documentation/cgroup-v1/memory.txt">memory.txt</ulink>.</para>
<para>Implies <literal>MemoryAccounting=true</literal>.</para>
</listitem>
@@ -222,7 +222,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
the <literal>blkio.weight</literal> control group attribute,
which defaults to 1000. For details about this control group
attribute, see <ulink
- url="https://www.kernel.org/doc/Documentation/cgroups/blkio-controller.txt">blkio-controller.txt</ulink>.
+ url="https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt">blkio-controller.txt</ulink>.
The available IO bandwidth is split up among all units within
one slice relative to their block IO weight.</para>
@@ -254,7 +254,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
attribute, which defaults to 1000. Use this option multiple
times to set weights for multiple devices. For details about
this control group attribute, see <ulink
- url="https://www.kernel.org/doc/Documentation/cgroups/blkio-controller.txt">blkio-controller.txt</ulink>.</para>
+ url="https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt">blkio-controller.txt</ulink>.</para>
<para>Implies
<literal>BlockIOAccounting=true</literal>.</para>
@@ -282,7 +282,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
attributes. Use this option multiple times to set bandwidth
limits for multiple devices. For details about these control
group attributes, see <ulink
- url="https://www.kernel.org/doc/Documentation/cgroups/blkio-controller.txt">blkio-controller.txt</ulink>.
+ url="https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt">blkio-controller.txt</ulink>.
</para>
<para>Implies
@@ -306,7 +306,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<literal>devices.deny</literal> control group
attributes. For details about these control group
attributes, see <ulink
- url="https://www.kernel.org/doc/Documentation/cgroups/devices.txt">devices.txt</ulink>.</para>
+ url="https://www.kernel.org/doc/Documentation/cgroup-v1/devices.txt">devices.txt</ulink>.</para>
<para>The device node specifier is either a path to a device
node in the file system, starting with
@@ -411,10 +411,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
The documentation for control groups and specific controllers in the Linux kernel:
- <ulink url="https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt">cgroups.txt</ulink>,
- <ulink url="https://www.kernel.org/doc/Documentation/cgroups/cpuacct.txt">cpuacct.txt</ulink>,
- <ulink url="https://www.kernel.org/doc/Documentation/cgroups/memory.txt">memory.txt</ulink>,
- <ulink url="https://www.kernel.org/doc/Documentation/cgroups/blkio-controller.txt">blkio-controller.txt</ulink>.
+ <ulink url="https://www.kernel.org/doc/Documentation/cgroup-v1/cgroups.txt">cgroups.txt</ulink>,
+ <ulink url="https://www.kernel.org/doc/Documentation/cgroup-v1/cpuacct.txt">cpuacct.txt</ulink>,
+ <ulink url="https://www.kernel.org/doc/Documentation/cgroup-v1/memory.txt">memory.txt</ulink>,
+ <ulink url="https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt">blkio-controller.txt</ulink>.
</para>
</refsect1>
</refentry>
......@@ -161,6 +161,7 @@ nspawn-fix-network-interface.patch
service-use-the-right-timeout-for-stop-processes-we-fork.patch
core-don-t-reset-log-level-to-NOTICE-if-we-get-quiet-on-t.patch
sd-event-fix-prepare-priority-queue-comparison-function.patch
man-update-links-to-kernel.org-cgroup-documentation.patch
## Debian specific patches:
Add-back-support-for-Debian-specific-config-files.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment