From c51fa94772d85f2a2442d6bcecb5efc4c102ff34 Mon Sep 17 00:00:00 2001 From: Martin Pitt 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 --- man/systemd.resource-control.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'man') diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index 08cdf06e23..804d7375b0 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -202,7 +202,7 @@ controls the memory.limit_in_bytes control group attribute. For details about this control group attribute, see memory.txt. + url="https://www.kernel.org/doc/Documentation/cgroup-v1/memory.txt">memory.txt. Implies MemoryAccounting=true. @@ -239,7 +239,7 @@ controls the pids.max control group attribute. For details about this control group attribute, see pids.txt. + url="https://www.kernel.org/doc/Documentation/cgroup-v1/pids.txt">pids.txt. Implies TasksAccounting=true. The system default for this setting may be controlled with @@ -273,7 +273,7 @@ the blkio.weight control group attribute, which defaults to 500. For details about this control group attribute, see blkio-controller.txt. + url="https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt">blkio-controller.txt. The available I/O bandwidth is split up among all units within one slice relative to their block I/O weight. @@ -305,7 +305,7 @@ attribute, which defaults to 1000. Use this option multiple times to set weights for multiple devices. For details about this control group attribute, see blkio-controller.txt. + url="https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt">blkio-controller.txt. Implies BlockIOAccounting=true. @@ -333,7 +333,7 @@ attributes. Use this option multiple times to set bandwidth limits for multiple devices. For details about these control group attributes, see blkio-controller.txt. + url="https://www.kernel.org/doc/Documentation/cgroup-v1/blkio-controller.txt">blkio-controller.txt. Implies @@ -357,7 +357,7 @@ devices.deny control group attributes. For details about these control group attributes, see devices.txt. + url="https://www.kernel.org/doc/Documentation/cgroup-v1/devices.txt">devices.txt. The device node specifier is either a path to a device node in the file system, starting with @@ -482,10 +482,10 @@ systemd.directives7, systemd.special7, The documentation for control groups and specific controllers in the Linux kernel: - cgroups.txt, - cpuacct.txt, - memory.txt, - blkio-controller.txt. + cgroups.txt, + cpuacct.txt, + memory.txt, + blkio-controller.txt. -- cgit v1.2.3-54-g00ecf From 5e939dd6a47571f731a92aa1288e955fde7a37f8 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 5 Apr 2016 15:28:47 +0200 Subject: man: fix cgroup attributes for device throttling --- man/systemd.resource-control.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'man') diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index 804d7375b0..fd6f7a1b69 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -328,8 +328,8 @@ Gigabytes, or Terabytes, respectively, to the base of 1000. (Example: "/dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0 5M"). This - controls the blkio.read_bps_device and - blkio.write_bps_device control group + controls the blkio.throttle.read_bps_device and + blkio.throttle.write_bps_device control group attributes. Use this option multiple times to set bandwidth limits for multiple devices. For details about these control group attributes, see