|
 |
a4b143 |
From a8c3f5121fac2cc4f8e3221a5a06b63d2e9c6f02 Mon Sep 17 00:00:00 2001
|
|
|
a4b143 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
a4b143 |
Date: Fri, 27 Sep 2013 00:05:07 +0200
|
|
|
a4b143 |
Subject: [PATCH] man: drop references to "cgroup" wher appropriate
|
|
|
a4b143 |
|
|
|
a4b143 |
Since cgroups are mostly now an implementation detail of systemd lets
|
|
|
a4b143 |
deemphasize it a bit in the man pages. This renames systemd.cgroup(5) to
|
|
|
a4b143 |
systemd.resource-control(5) and uses the term "resource control" rather
|
|
|
a4b143 |
than "cgroup" where appropriate.
|
|
|
a4b143 |
|
|
|
a4b143 |
This leaves the word "cgroup" in at a couple of places though, like for
|
|
|
a4b143 |
example systemd-cgtop and systemd-cgls where cgroup stuff is at the core
|
|
|
a4b143 |
of what is happening.
|
|
|
a4b143 |
|
|
|
a4b143 |
Conflicts:
|
|
|
a4b143 |
man/systemd.exec.xml
|
|
|
a4b143 |
---
|
|
|
a4b143 |
Makefile-man.am | 2 +-
|
|
|
a4b143 |
man/loginctl.xml | 4 ++--
|
|
|
a4b143 |
man/machinectl.xml | 4 ++--
|
|
|
a4b143 |
man/pam_systemd.xml | 2 +-
|
|
|
a4b143 |
man/systemctl.xml | 14 ++++++-------
|
|
|
a4b143 |
man/systemd-cgls.xml | 6 +++---
|
|
|
a4b143 |
man/systemd-cgtop.xml | 4 ++--
|
|
|
a4b143 |
man/systemd.exec.xml | 5 +++--
|
|
|
a4b143 |
man/systemd.mount.xml | 6 +++---
|
|
|
a4b143 |
...emd.cgroup.xml => systemd.resource-control.xml} | 24 ++++++++++------------
|
|
|
a4b143 |
man/systemd.scope.xml | 2 +-
|
|
|
a4b143 |
man/systemd.service.xml | 6 +++---
|
|
|
a4b143 |
man/systemd.slice.xml | 22 ++++++++++----------
|
|
|
a4b143 |
man/systemd.socket.xml | 12 +++++------
|
|
|
a4b143 |
man/systemd.swap.xml | 6 +++---
|
|
|
a4b143 |
15 files changed, 59 insertions(+), 60 deletions(-)
|
|
|
a4b143 |
rename man/{systemd.cgroup.xml => systemd.resource-control.xml} (96%)
|
|
|
a4b143 |
|
|
|
a4b143 |
diff --git a/Makefile-man.am b/Makefile-man.am
|
|
|
a4b143 |
index 1f63595..c8a4342 100644
|
|
|
a4b143 |
--- a/Makefile-man.am
|
|
|
a4b143 |
+++ b/Makefile-man.am
|
|
|
a4b143 |
@@ -78,7 +78,6 @@ MANPAGES += \
|
|
|
a4b143 |
man/systemd-update-utmp.service.8 \
|
|
|
a4b143 |
man/systemd.1 \
|
|
|
a4b143 |
man/systemd.automount.5 \
|
|
|
a4b143 |
- man/systemd.cgroup.5 \
|
|
|
a4b143 |
man/systemd.device.5 \
|
|
|
a4b143 |
man/systemd.exec.5 \
|
|
|
a4b143 |
man/systemd.journal-fields.7 \
|
|
|
a4b143 |
@@ -86,6 +85,7 @@ MANPAGES += \
|
|
|
a4b143 |
man/systemd.mount.5 \
|
|
|
a4b143 |
man/systemd.path.5 \
|
|
|
a4b143 |
man/systemd.preset.5 \
|
|
|
a4b143 |
+ man/systemd.resource-control.5 \
|
|
|
a4b143 |
man/systemd.scope.5 \
|
|
|
a4b143 |
man/systemd.service.5 \
|
|
|
a4b143 |
man/systemd.slice.5 \
|
|
|
a4b143 |
diff --git a/man/loginctl.xml b/man/loginctl.xml
|
|
|
a4b143 |
index ef0dfc0..1b54ff7 100644
|
|
|
a4b143 |
--- a/man/loginctl.xml
|
|
|
a4b143 |
+++ b/man/loginctl.xml
|
|
|
a4b143 |
@@ -117,8 +117,8 @@
|
|
|
a4b143 |
<term><option>-l</option></term>
|
|
|
a4b143 |
<term><option>--full</option></term>
|
|
|
a4b143 |
|
|
|
a4b143 |
- <listitem><para>Do not ellipsize cgroup
|
|
|
a4b143 |
- members.</para>
|
|
|
a4b143 |
+ <listitem><para>Do not ellipsize
|
|
|
a4b143 |
+ process tree entries.</para>
|
|
|
a4b143 |
</listitem>
|
|
|
a4b143 |
</varlistentry>
|
|
|
a4b143 |
|
|
|
a4b143 |
diff --git a/man/machinectl.xml b/man/machinectl.xml
|
|
|
a4b143 |
index 5efa3a5..2ed9f2e 100644
|
|
|
a4b143 |
--- a/man/machinectl.xml
|
|
|
a4b143 |
+++ b/man/machinectl.xml
|
|
|
a4b143 |
@@ -117,8 +117,8 @@
|
|
|
a4b143 |
<term><option>-l</option></term>
|
|
|
a4b143 |
<term><option>--full</option></term>
|
|
|
a4b143 |
|
|
|
a4b143 |
- <listitem><para>Do not ellipsize cgroup
|
|
|
a4b143 |
- members.</para>
|
|
|
a4b143 |
+ <listitem><para>Do not ellipsize
|
|
|
a4b143 |
+ process tree entries.</para>
|
|
|
a4b143 |
</listitem>
|
|
|
a4b143 |
</varlistentry>
|
|
|
a4b143 |
|
|
|
a4b143 |
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
|
|
|
a4b143 |
index 951ae20..0e25a4a 100644
|
|
|
a4b143 |
--- a/man/pam_systemd.xml
|
|
|
a4b143 |
+++ b/man/pam_systemd.xml
|
|
|
a4b143 |
@@ -55,7 +55,7 @@
|
|
|
a4b143 |
<title>Description</title>
|
|
|
a4b143 |
|
|
|
a4b143 |
<para><command>pam_systemd</command> registers user
|
|
|
a4b143 |
- sessions in the systemd login manager
|
|
|
a4b143 |
+ sessions with the systemd login manager
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
|
|
a4b143 |
and hence the systemd control group hierarchy.</para>
|
|
|
a4b143 |
|
|
|
a4b143 |
diff --git a/man/systemctl.xml b/man/systemctl.xml
|
|
|
a4b143 |
index 51c34b7..a70c964 100644
|
|
|
a4b143 |
--- a/man/systemctl.xml
|
|
|
a4b143 |
+++ b/man/systemctl.xml
|
|
|
a4b143 |
@@ -187,7 +187,7 @@ systemctl start foo
|
|
|
a4b143 |
<term><option>--full</option></term>
|
|
|
a4b143 |
|
|
|
a4b143 |
<listitem>
|
|
|
a4b143 |
- <para>Do not ellipsize unit names, cgroup members, and
|
|
|
a4b143 |
+ <para>Do not ellipsize unit names, process tree entries, and
|
|
|
a4b143 |
truncate unit descriptions in the output of
|
|
|
a4b143 |
<command>list-units</command> and
|
|
|
a4b143 |
<command>list-jobs</command>.</para>
|
|
|
a4b143 |
@@ -724,14 +724,14 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
|
|
|
a4b143 |
<listitem>
|
|
|
a4b143 |
<para>Set the specified unit properties at runtime where
|
|
|
a4b143 |
this is supported. This allows changing configuration
|
|
|
a4b143 |
- parameter properties such as resource management controls at
|
|
|
a4b143 |
+ parameter properties such as resource control settings at
|
|
|
a4b143 |
runtime. Not all properties may be changed at runtime, but
|
|
|
a4b143 |
- many resource management settings (primarily those in
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>)
|
|
|
a4b143 |
+ many resource control settings (primarily those in
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>)
|
|
|
a4b143 |
may. The changes are applied instantly, and stored on disk
|
|
|
a4b143 |
for future boots, unless <option>--runtime</option> is
|
|
|
a4b143 |
- passed, in which case the settings only apply until the next
|
|
|
a4b143 |
- reboot. The syntax of the property assignment follows
|
|
|
a4b143 |
+ passed, in which case the settings only apply until the
|
|
|
a4b143 |
+ next reboot. The syntax of the property assignment follows
|
|
|
a4b143 |
closely the syntax of assignments in unit files.</para>
|
|
|
a4b143 |
|
|
|
a4b143 |
<para>Example: <command>systemctl set-property foobar.service CPUShares=777</command></para>
|
|
|
a4b143 |
@@ -1299,7 +1299,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
|
|
|
a4b143 |
<citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-management</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
|
|
a4b143 |
diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
|
|
|
a4b143 |
index fcaf894..432706b 100644
|
|
|
a4b143 |
--- a/man/systemd-cgls.xml
|
|
|
a4b143 |
+++ b/man/systemd-cgls.xml
|
|
|
a4b143 |
@@ -116,8 +116,8 @@
|
|
|
a4b143 |
<term><option>-l</option></term>
|
|
|
a4b143 |
<term><option>--full</option></term>
|
|
|
a4b143 |
|
|
|
a4b143 |
- <listitem><para>Do not ellipsize cgroup
|
|
|
a4b143 |
- members.</para>
|
|
|
a4b143 |
+ <listitem><para>Do not ellipsize
|
|
|
a4b143 |
+ process tree members.</para>
|
|
|
a4b143 |
</listitem>
|
|
|
a4b143 |
</varlistentry>
|
|
|
a4b143 |
|
|
|
a4b143 |
@@ -132,7 +132,7 @@
|
|
|
a4b143 |
<term><option>-m <replaceable>MACHINE</replaceable></option></term>
|
|
|
a4b143 |
<term><option>--machine=<replaceable>MACHINE</replaceable></option></term>
|
|
|
a4b143 |
|
|
|
a4b143 |
- <listitem><para>Limit cgroups shown to
|
|
|
a4b143 |
+ <listitem><para>Limit control groups shown to
|
|
|
a4b143 |
the part corresponding to the
|
|
|
a4b143 |
container <replaceable>MACHINE</replaceable>.
|
|
|
a4b143 |
</para></listitem>
|
|
|
a4b143 |
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
|
|
|
a4b143 |
index 51549c4..7faedfb 100644
|
|
|
a4b143 |
--- a/man/systemd-cgtop.xml
|
|
|
a4b143 |
+++ b/man/systemd-cgtop.xml
|
|
|
a4b143 |
@@ -80,7 +80,7 @@
|
|
|
a4b143 |
<varname>MemoryAccounting=1</varname> and
|
|
|
a4b143 |
<varname>BlockIOAccounting=1</varname> settings in the
|
|
|
a4b143 |
unit files in question (See
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
|
|
a4b143 |
for details).</para>
|
|
|
a4b143 |
|
|
|
a4b143 |
<para>To emphasize this: unless
|
|
|
a4b143 |
@@ -274,7 +274,7 @@
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd-cgls</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>top</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
|
|
a4b143 |
</para>
|
|
|
a4b143 |
</refsect1>
|
|
|
a4b143 |
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
|
|
|
a4b143 |
index 5721dc1..28d7fd4 100644
|
|
|
a4b143 |
--- a/man/systemd.exec.xml
|
|
|
a4b143 |
+++ b/man/systemd.exec.xml
|
|
|
a4b143 |
@@ -1017,8 +1017,9 @@
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.swap</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>exec</refentrytitle><manvolnum>3</manvolnum></citerefentry>
|
|
|
a4b143 |
</para>
|
|
|
a4b143 |
</refsect1>
|
|
|
a4b143 |
|
|
|
a4b143 |
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
|
|
|
a4b143 |
index e5b5c3c..48af1ca 100644
|
|
|
a4b143 |
--- a/man/systemd.mount.xml
|
|
|
a4b143 |
+++ b/man/systemd.mount.xml
|
|
|
a4b143 |
@@ -76,8 +76,8 @@
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
which define the way the processes are terminated, and
|
|
|
a4b143 |
in
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- which configure control group settings for the
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ which configure resource control settings for the
|
|
|
a4b143 |
processes of the service. Note that the User= and
|
|
|
a4b143 |
Group= options are not particularly useful for mount
|
|
|
a4b143 |
units specifying a <literal>Type=</literal> option or
|
|
|
a4b143 |
@@ -302,7 +302,7 @@
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.device</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>proc</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
diff --git a/man/systemd.cgroup.xml b/man/systemd.resource-control.xml
|
|
|
a4b143 |
similarity index 96%
|
|
|
a4b143 |
rename from man/systemd.cgroup.xml
|
|
|
a4b143 |
rename to man/systemd.resource-control.xml
|
|
|
a4b143 |
index cc0eb15..2427f208 100644
|
|
|
a4b143 |
--- a/man/systemd.cgroup.xml
|
|
|
a4b143 |
+++ b/man/systemd.resource-control.xml
|
|
|
a4b143 |
@@ -22,9 +22,9 @@ You should have received a copy of the GNU Lesser General Public License
|
|
|
a4b143 |
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
a4b143 |
-->
|
|
|
a4b143 |
|
|
|
a4b143 |
-<refentry id="systemd.cgroup">
|
|
|
a4b143 |
+<refentry id="systemd.resource-control">
|
|
|
a4b143 |
<refentryinfo>
|
|
|
a4b143 |
- <title>systemd.cgroup</title>
|
|
|
a4b143 |
+ <title>systemd.resource-control</title>
|
|
|
a4b143 |
<productname>systemd</productname>
|
|
|
a4b143 |
|
|
|
a4b143 |
<authorgroup>
|
|
|
a4b143 |
@@ -38,13 +38,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
a4b143 |
</refentryinfo>
|
|
|
a4b143 |
|
|
|
a4b143 |
<refmeta>
|
|
|
a4b143 |
- <refentrytitle>systemd.cgroup</refentrytitle>
|
|
|
a4b143 |
+ <refentrytitle>systemd.resource-control</refentrytitle>
|
|
|
a4b143 |
<manvolnum>5</manvolnum>
|
|
|
a4b143 |
</refmeta>
|
|
|
a4b143 |
|
|
|
a4b143 |
<refnamediv>
|
|
|
a4b143 |
- <refname>systemd.cgroup</refname>
|
|
|
a4b143 |
- <refpurpose>Control Group configuration unit settings</refpurpose>
|
|
|
a4b143 |
+ <refname>systemd.resource-control</refname>
|
|
|
a4b143 |
+ <refpurpose>Resource control unit settings</refpurpose>
|
|
|
a4b143 |
</refnamediv>
|
|
|
a4b143 |
|
|
|
a4b143 |
<refsynopsisdiv>
|
|
|
a4b143 |
@@ -63,12 +63,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
a4b143 |
|
|
|
a4b143 |
<para>Unit configuration files for services, slices, scopes,
|
|
|
a4b143 |
sockets, mount points, and swap devices share a subset of
|
|
|
a4b143 |
- configuration options which configure the control group settings
|
|
|
a4b143 |
- for spawned processes.</para>
|
|
|
a4b143 |
-
|
|
|
a4b143 |
- <para>Control Groups is a concept for organizing processes in a
|
|
|
a4b143 |
- hierarch tree of named groups for the purpose of resource
|
|
|
a4b143 |
- management.</para>
|
|
|
a4b143 |
+ configuration options for resource control of spawned
|
|
|
a4b143 |
+ processes. Internally, this relies on the the Control Groups
|
|
|
a4b143 |
+ kernel concept for organizing processes in a hierarchial tree of
|
|
|
a4b143 |
+ named groups for the purpose of resource management.</para>
|
|
|
a4b143 |
|
|
|
a4b143 |
<para>This man page lists the configuration options shared by
|
|
|
a4b143 |
those six unit types. See
|
|
|
a4b143 |
@@ -82,7 +80,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
a4b143 |
and
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.swap</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
|
|
a4b143 |
for more information on the specific unit configuration files. The
|
|
|
a4b143 |
- execution-specific configuration options are configured in the
|
|
|
a4b143 |
+ resource control configuration options are configured in the
|
|
|
a4b143 |
[Slice], [Scope], [Service], [Socket], [Mount], or [Swap]
|
|
|
a4b143 |
sections, depending on the unit type.</para>
|
|
|
a4b143 |
</refsect1>
|
|
|
a4b143 |
@@ -91,7 +89,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
a4b143 |
<title>Options</title>
|
|
|
a4b143 |
|
|
|
a4b143 |
<para>Units of the types listed above can have settings
|
|
|
a4b143 |
- for cgroup configuration:</para>
|
|
|
a4b143 |
+ for resource control configuration:</para>
|
|
|
a4b143 |
|
|
|
a4b143 |
<variablelist class='unit-directives'>
|
|
|
a4b143 |
|
|
|
a4b143 |
diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml
|
|
|
a4b143 |
index e8fa1ae..9813e0a 100644
|
|
|
a4b143 |
--- a/man/systemd.scope.xml
|
|
|
a4b143 |
+++ b/man/systemd.scope.xml
|
|
|
a4b143 |
@@ -86,7 +86,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
|
|
|
a4b143 |
</para>
|
|
|
a4b143 |
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
|
|
|
a4b143 |
index 8eda85f..45f96fa 100644
|
|
|
a4b143 |
--- a/man/systemd.service.xml
|
|
|
a4b143 |
+++ b/man/systemd.service.xml
|
|
|
a4b143 |
@@ -76,8 +76,8 @@
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
which define the way the processes of the service are
|
|
|
a4b143 |
terminated, and in
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- which configure control group settings for the
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ which configure resource control settings for the
|
|
|
a4b143 |
processes of the service.</para>
|
|
|
a4b143 |
|
|
|
a4b143 |
<para>Unless <varname>DefaultDependencies=</varname>
|
|
|
a4b143 |
@@ -1006,7 +1006,7 @@
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
|
|
|
a4b143 |
</para>
|
|
|
a4b143 |
diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml
|
|
|
a4b143 |
index b7b0622..4d27ddf 100644
|
|
|
a4b143 |
--- a/man/systemd.slice.xml
|
|
|
a4b143 |
+++ b/man/systemd.slice.xml
|
|
|
a4b143 |
@@ -58,14 +58,14 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
a4b143 |
<literal>.slice</literal> encodes information about a slice which
|
|
|
a4b143 |
is a concept for hierarchially managing resources of a group of
|
|
|
a4b143 |
processes. This management is performed by creating a node in the
|
|
|
a4b143 |
- control group tree. Units that manage processes (primarilly scope
|
|
|
a4b143 |
- and service units) may be assigned to a specific slice. For each
|
|
|
a4b143 |
- slice, certain resource limits may the be set that apply to all
|
|
|
a4b143 |
- processes of all units contained in that slice. Slices are
|
|
|
a4b143 |
- organized hierarchially in a tree. The name of the slice encodes
|
|
|
a4b143 |
- the location in the tree. The name consists of a dash-separated
|
|
|
a4b143 |
- series of names, which describes the path to the slice from the
|
|
|
a4b143 |
- root slice. The root slice is named,
|
|
|
a4b143 |
+ Linux Control Group (cgroup) tree. Units that manage processes
|
|
|
a4b143 |
+ (primarilly scope and service units) may be assigned to a specific
|
|
|
a4b143 |
+ slice. For each slice, certain resource limits may the be set that
|
|
|
a4b143 |
+ apply to all processes of all units contained in that
|
|
|
a4b143 |
+ slice. Slices are organized hierarchially in a tree. The name of
|
|
|
a4b143 |
+ the slice encodes the location in the tree. The name consists of a
|
|
|
a4b143 |
+ dash-separated series of names, which describes the path to the
|
|
|
a4b143 |
+ slice from the root slice. The root slice is named,
|
|
|
a4b143 |
<filename>-.slice</filename>. Example:
|
|
|
a4b143 |
<filename>foo-bar.slice</filename> is a slice that is located
|
|
|
a4b143 |
within <filename>foo.slice</filename>, which in turn is located in
|
|
|
a4b143 |
@@ -89,9 +89,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
a4b143 |
files. The common configuration items are configured
|
|
|
a4b143 |
in the generic [Unit] and [Install] sections. The
|
|
|
a4b143 |
slice specific configuration options are configured in
|
|
|
a4b143 |
- the [Slice] section. Currently, only generic cgroup settings
|
|
|
a4b143 |
+ the [Slice] section. Currently, only generic resource control settings
|
|
|
a4b143 |
as described in
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>7</manvolnum></citerefentry> are allowed.
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>7</manvolnum></citerefentry> are allowed.
|
|
|
a4b143 |
</para>
|
|
|
a4b143 |
|
|
|
a4b143 |
<para>Unless <varname>DefaultDependencies=false</varname>
|
|
|
a4b143 |
@@ -110,7 +110,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
a4b143 |
<para>
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
|
|
|
a4b143 |
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
|
|
|
a4b143 |
index 419a38c..8c88d9f 100644
|
|
|
a4b143 |
--- a/man/systemd.socket.xml
|
|
|
a4b143 |
+++ b/man/systemd.socket.xml
|
|
|
a4b143 |
@@ -78,11 +78,11 @@
|
|
|
a4b143 |
<option>ExecStopPost=</option> commands are executed
|
|
|
a4b143 |
in, and in
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- which define the way the processes are
|
|
|
a4b143 |
- terminated, and in
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- which configure control group settings for the
|
|
|
a4b143 |
- processes of the service.</para>
|
|
|
a4b143 |
+ which define the way the processes are terminated, and
|
|
|
a4b143 |
+ in
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ which configure resource control settings for the
|
|
|
a4b143 |
+ processes of the socket.</para>
|
|
|
a4b143 |
|
|
|
a4b143 |
<para>For each socket file a matching service file
|
|
|
a4b143 |
(see
|
|
|
a4b143 |
@@ -712,7 +712,7 @@
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
|
|
|
a4b143 |
</para>
|
|
|
a4b143 |
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
|
|
|
a4b143 |
index 18ef5b0..813ae6c 100644
|
|
|
a4b143 |
--- a/man/systemd.swap.xml
|
|
|
a4b143 |
+++ b/man/systemd.swap.xml
|
|
|
a4b143 |
@@ -76,8 +76,8 @@
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
which define the way the processes are
|
|
|
a4b143 |
terminated, and in
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- which configure control group settings for the
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ which configure resource control settings for the
|
|
|
a4b143 |
processes of the service.</para>
|
|
|
a4b143 |
|
|
|
a4b143 |
<para>Swap units must be named after the devices
|
|
|
a4b143 |
@@ -206,7 +206,7 @@
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.device</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
|
|
a4b143 |
<citerefentry><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|