X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fpam_systemd.xml;h=f81a4070bce6b8200c3aec07253e8a18469c9590;hp=66d40fca451d6088f92ebe9ae00df3292c81b69d;hb=c1405e4f313768519d66f49e0ffcbe964409d150;hpb=a4cd87e9dce6d38846f23d44df9e21f322f946df
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index 66d40fca4..f81a4070b 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -72,11 +72,11 @@
$XDG_SESSION_ID environment
variable is initialized. If auditing is
available and
- pam_loginuid.so run before
+ pam_loginuid.so was run before
this module (which is highly recommended), the
variable is initialized from the auditing
session id
- (/proc/self/sessionid). Otherwise
+ (/proc/self/sessionid). Otherwise,
an independent session counter is
used.
@@ -84,21 +84,23 @@
created for the session. If this is the first
concurrent session of the user, an implicit
slice below user.slice is
- automatically created and the scope placed in
- it. In instance of the system service
- user@.service which runs
- the systemd user manager
- instance.
+ automatically created and the scope placed into
+ it. An instance of the system service
+ user@.service, which runs
+ the systemd user manager instance, is started.
+
On logout, this module ensures the following:
- If this is enabled, all
+ If enabled in
+ logind.conf
+ 5, all
processes of the session are terminated. If
- the last concurrent session of a user ends, his
- user systemd instance will be terminated too,
- and so will the user's slice
+ the last concurrent session of a user ends,
+ ther user's systemd instance will be
+ terminated too, and so will the user's slice
unit.
If the last concurrent session
@@ -145,8 +147,9 @@
variable takes precedence. One of
unspecified,
tty,
- x11 or
- wayland. See
+ x11,
+ wayland or
+ mir. See
sd_session_get_type3
for details about the session type.
@@ -199,9 +202,9 @@
to the user login time on the
machine. It is automatically created
the first time a user logs in and
- removed on his final logout. If a user
- logs in twice at the same time, both
- sessions will see the same
+ removed on the user's final logout. If
+ a user logs in twice at the same time,
+ both sessions will see the same
$XDG_RUNTIME_DIR
and the same contents. If a user logs
in once, then logs out again, and logs
@@ -227,7 +230,7 @@
The following environment variables are read by
the module and may be used by the PAM service to pass
- meta data to the module:
+ metadata to the module:
@@ -253,15 +256,23 @@
$XDG_SESSION_DESKTOP
- The session
- deskop. This may be used to indicate
- the session desktop used, where this
- applies. This should be a short,
- lowercase string identifying the
- desktop environment used if this
+ A single, short
+ identifier string for the desktop
+ environment. This may be used to
+ indicate the session desktop used,
+ where this applies and if this
information is available. For example:
- gnome, or
- kde.
+ GNOME, or
+ KDE. It is
+ recommended to use the same
+ identifiers and capitalization as for
+ $XDG_CURRENT_DESKTOP,
+ as defined by the Desktop
+ Entry
+ Specification. See
+ sd_session_get_desktop3
+ for more details.
@@ -305,10 +316,10 @@ session required pam_systemd.so
systemd-logind.service8,
logind.conf5,
loginctl1,
- pam.conf5,
- pam.d5,
- pam8,
- pam_loginuid8,
+ pam.conf5,
+ pam.d5,
+ pam8,
+ pam_loginuid8,
systemd.scope5,
systemd.slice5,
systemd.service5