man: clarify how to configure default control group hierarchies for services and...

diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 96e5936e5edd85f71602c696f8e0ed8865ccefe3..362a4f61081446fa7008c52f037b299dff6d58b7 100644 (file)
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -207,10 +207,17 @@
 
                                 <listitem><para>These settings control
                                 the default control group hierarchies
-                                users logging in are added to. When
-                                logging in users will get private
-                                control groups in all hierarchies
-                                listed in
+                                users logging in are added to, in
+                                addition to the
+                                <literal>name=systemd</literal> named
+                                hierarchy. These settings take space
+                                separated lists of controller
+                                names. Pass the empty string to ensure
+                                that logind does not touch any
+                                hierarchies but systemd's own. When
+                                logging in user sessions will get
+                                private control groups in all
+                                hierarchies listed in
                                 <varname>Controllers=</varname> and be
                                 reset to the root control group in all
                                 hierarchies listed in
@@ -218,7 +225,15 @@
                                 defaults to the empty list,
                                 <varname>ResetControllers=</varname>
                                 defaults to
-                                <literal>cpu</literal>.</para></listitem>
+                                <literal>cpu</literal>. Note that for
+                                all controllers that are not listed in
+                                either <varname>Controllers=</varname>
+                                nor
+                                <varname>ResetControllers=</varname>
+                                newly created sessions will be part of
+                                the control groups of the system
+                                service that created the
+                                session.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 12979d81b67dc48f436654554a7b765d9524a053..eaa770b4b1ef0fdc1b03ee7a1a5938d0c2b67553 100644 (file)
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -107,15 +107,16 @@
                                 <term><varname>DefaultControllers=cpu</varname></term>
 
                                 <listitem><para>Configures in which
-                                cgroup controller hierarchies to
-                                create per-service cgroups
-                                automatically, in addition to the
-                                name=systemd named hierarchy. Defaults
-                                to 'cpu'. Takes a space separated list
-                                of controller names. Pass an empty
-                                string to ensure that systemd does not
-                                touch any hierarchies but its
-                                own.</para>
+                                control group hierarchies to create
+                                per-service cgroups automatically, in
+                                addition to the
+                                <literal>name=systemd</literal> named
+                                hierarchy. Defaults to
+                                <literal>cpu</literal>. Takes a space
+                                separated list of controller
+                                names. Pass the empty string to ensure
+                                that systemd does not touch any
+                                hierarchies but its own.</para>
 
                                 <para>Note that the default value of
                                 'cpu' will make realtime scheduling