X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fpam_systemd.xml;h=cd806da93131987bcc6ddbd1408df1df124a9a03;hp=bfcc684521cb9a472ba44129ee71cbaf0f287214;hb=afe4bfe2c1ed28a3e75c627edf458d2f40ff16f8;hpb=af62c704053b5d34672497eb5bdc4764ebbb5f4f

diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index bfcc68452..cd806da93 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -92,7 +92,7 @@
                         <listitem><para>If
                         <option>create-session=0</option> is set, a new
                         control group
-                        <filename>/user/$USER/no-session</filename>
+                        <filename>/user/$USER/user</filename>
                         is created and the login process moved into
                         it.</para></listitem>
 
@@ -115,7 +115,7 @@
                         remaining processes in the
                         <filename>/user/$USER/$XDG_SESSION_ID</filename>
                         control group are migrated to
-                        <filename>/user/$USER/no-session</filename> and
+                        <filename>/user/$USER/user</filename> and
                         the original control group is
                         removed.</para></listitem>
 
@@ -123,7 +123,7 @@
                         <option>kill-user=1</option> is specified, and
                         no other user session control group remains,
                         except
-                        <filename>/user/$USER/no-session</filename>,
+                        <filename>/user/$USER/user</filename>,
                         all remaining processes in the
                         <filename>/user/$USER</filename> hierarchy
                         are killed and the control group is removed.</para></listitem>
@@ -200,6 +200,26 @@
                                 terminated only on their complete
                                 logout.</para></listitem>
                         </varlistentry>
+
+                        <varlistentry>
+                                <term><option>controllers=</option></term>
+
+                                <listitem><para>Takes a comma
+                                separated list of cgroup controllers
+                                in which hierarchies a user/session
+                                cgroup will be created by default for
+                                each user logging in. If ommited,
+                                defaults to 'cpu', meaning that in
+                                addition to creating per-user and
+                                per-session cgroups in systemd's own
+                                hierarchy, groups are created in the
+                                'cpu' hierarchy, on order to ensure
+                                that every use and every sessions gets
+                                an equal amount of CPU time,
+                                regardless how many processes a user
+                                or session might
+                                own.</para></listitem>
+                        </varlistentry>
                 </variablelist>
 
                 <para>Note that setting <varname>kill-user=1</varname>