Skip to content

Commit 41b6ae4

Browse files
committed
man: reword description of KillOnlyUsers=/KillExcludeUsers=
Fixes systemd#17177.
1 parent e6fd398 commit 41b6ae4

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

man/homectl.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,9 @@
359359
(e.g. <filename>/dev/hidraw1</filename>), referring to a FIDO2 security token implementing the
360360
<literal>hmac-secret</literal> extension that shall be able to unlock the user account. A random salt
361361
value is generated on the host and passed to the FIDO2 device, which calculates a HMAC hash of the
362-
salt combined with an internal secret key. The result is then used as the key to unlock the user
363-
account. The random salt is included in the user record, so that whenever authentication is needed it
364-
can be passed again to the FIDO2 token again.</para>
362+
salt using an internal secret key. The result is then used as the key to unlock the user account. The
363+
random salt is included in the user record, so that whenever authentication is needed it can be
364+
passed to the FIDO2 token again.</para>
365365

366366
<para>Instead of a valid path to a FIDO2 <literal>hidraw</literal> device the special strings
367367
<literal>list</literal> and <literal>auto</literal> may be specified. If <literal>list</literal> is

man/logind.conf.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,16 @@
125125
<term><varname>KillOnlyUsers=</varname></term>
126126
<term><varname>KillExcludeUsers=</varname></term>
127127

128-
<listitem><para>These settings take space-separated lists of usernames that override
129-
the <varname>KillUserProcesses=</varname> setting. A user name may be added to
130-
<varname>KillExcludeUsers=</varname> to exclude the processes in the session scopes of
131-
that user from being killed even if <varname>KillUserProcesses=yes</varname> is set. If
132-
<varname>KillExcludeUsers=</varname> is not set, the <literal>root</literal> user is
133-
excluded by default. <varname>KillExcludeUsers=</varname> may be set to an empty value
134-
to override this default. If a user is not excluded, <varname>KillOnlyUsers=</varname>
135-
is checked next. If this setting is specified, only the session scopes of those users
136-
will be killed. Otherwise, users are subject to the
137-
<varname>KillUserProcesses=yes</varname> setting.</para></listitem>
128+
<listitem><para>These settings take space-separated lists of usernames that override the
129+
<varname>KillUserProcesses=</varname> setting. A user name may be added to
130+
<varname>KillExcludeUsers=</varname> to exclude the processes in the session scopes of that user from
131+
being killed even if <varname>KillUserProcesses=yes</varname> is set. If
132+
<varname>KillExcludeUsers=</varname> is not set, the <literal>root</literal> user is excluded by
133+
default. <varname>KillExcludeUsers=</varname> may be set to an empty value to override this
134+
default. If a user is not excluded, <varname>KillOnlyUsers=</varname> is checked next. If this
135+
setting is specified, only the processes in the session scopes of those users will be
136+
killed. Otherwise, users are subject to the <varname>KillUserProcesses=yes</varname> setting.
137+
</para></listitem>
138138
</varlistentry>
139139

140140
<varlistentry>

0 commit comments

Comments
 (0)