X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Flogind.conf.xml;h=47ee0e73ff88d058dc97a344414c1fad704ef5cd;hb=cb90460e04743dd66dea37534af601786c428206;hp=d223514e0edd535009ca08beb69c6e74c86da83b;hpb=56ba3c78ae35065064c4289a0c8e22a81256af20;p=elogind.git
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index d223514e0..47ee0e73f 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -22,7 +22,7 @@
along with systemd; If not, see .
-->
-
+
logind.conf
systemd
@@ -163,7 +163,7 @@
will execute the action after all
sessions reported that they are idle,
and no idle inhibitor lock is active,
- and subsquently the time configured
+ and subsequently the time configured
with IdleActionSec=
(see below) has passed.
@@ -207,10 +207,17 @@
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
+ name=systemd 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
Controllers= and be
reset to the root control group in all
hierarchies listed in
@@ -218,7 +225,15 @@
defaults to the empty list,
ResetControllers=
defaults to
- cpu.
+ cpu. Note that for
+ all controllers that are not listed in
+ either Controllers=
+ nor
+ ResetControllers=
+ newly created sessions will be part of
+ the control groups of the system
+ service that created the
+ session.
@@ -329,7 +344,7 @@
systemd1,
systemd-logind.service8,
loginctl1,
- systemd.conf5
+ systemd-system.conf5