diff options
author | Michal Koutný <mkoutny@suse.com> | 2018-03-09 16:40:41 +0100 |
---|---|---|
committer | Michal Koutný <mkoutny@suse.com> | 2018-03-09 18:29:25 +0100 |
commit | c7f7e859f096f01ae6e12ac00d14ec66659fdaa6 (patch) | |
tree | 760d27897814600b64c7bcd3b6b2350c384c4952 /man | |
parent | 7f672e865a9e93356d7d81008645e824558c0fff (diff) | |
download | systemd-c7f7e859f096f01ae6e12ac00d14ec66659fdaa6.tar.gz |
man: Correct value of default KillUserProcesses=
Diffstat (limited to 'man')
-rw-r--r-- | man/custom-entities.ent.in | 1 | ||||
-rw-r--r-- | man/logind.conf.xml | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in index 778d6e97e5..e2bd44e5e7 100644 --- a/man/custom-entities.ent.in +++ b/man/custom-entities.ent.in @@ -7,3 +7,4 @@ <!ENTITY userenvgeneratordir @USER_ENV_GENERATOR_PATH@> <!ENTITY CERTIFICATE_ROOT @CERTIFICATE_ROOT@> <!ENTITY MEMORY_ACCOUNTING_DEFAULT @MEMORY_ACCOUNTING_DEFAULT_YES_NO@> +<!ENTITY KILL_USER_PROCESSES @KILL_USER_PROCESSES_YES_NO@> diff --git a/man/logind.conf.xml b/man/logind.conf.xml index 3fa3e85736..25d4d3a1b2 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -1,6 +1,9 @@ <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*--> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ +<!ENTITY % entities SYSTEM "custom-entities.ent" > +%entities; +]> <!-- SPDX-License-Identifier: LGPL-2.1+ @@ -126,7 +129,7 @@ corresponding to the session and all processes inside that scope will be terminated. If false, the scope is "abandoned", see <citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>, - and processes are not killed. Defaults to <literal>yes</literal>, + and processes are not killed. Defaults to <literal>&KILL_USER_PROCESSES;</literal>, but see the options <varname>KillOnlyUsers=</varname> and <varname>KillExcludeUsers=</varname> below.</para> |