core: allow setting RemainAfterExit= for transient services

[elogind.git] / man / logind.conf.xml

diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 96e5936e5edd85f71602c696f8e0ed8865ccefe3..8ab6d729a98cb157f561ba41967d3fbf7c62a595 100644 (file)
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -22,7 +22,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 

-<refentry id="logind.conf" conditional='HAVE_PAM'>
+<refentry id="logind.conf" conditional='ENABLE_LOGIND'>

         <refentryinfo>
                 <title>logind.conf</title>
                 <productname>systemd</productname>
         <refentryinfo>
                 <title>logind.conf</title>
                 <productname>systemd</productname>


@@ -54,7 +54,7 @@
         <refsect1>
                 <title>Description</title>
 
         <refsect1>
                 <title>Description</title>
 

-                <para>This file configures various parameters of the systemd login manager <citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+                <para>This file configures various parameters of the systemd login manager, <citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>

 
         </refsect1>
 
 
         </refsect1>
 


@@ -72,8 +72,8 @@
                                 <listitem><para>Takes a positive
                                 integer. Configures how many virtual
                                 terminals (VTs) to allocate by default
                                 <listitem><para>Takes a positive
                                 integer. Configures how many virtual
                                 terminals (VTs) to allocate by default

-                                that -- when switched to and
-                                previously unused --
+                                that, when switched to and are
+                                previously unused,

                                 <literal>autovt</literal> services are
                                 automatically spawned on. These
                                 services are instantiated from the
                                 <literal>autovt</literal> services are
                                 automatically spawned on. These
                                 services are instantiated from the


@@ -81,7 +81,7 @@
                                 <filename>autovt@.service</filename>
                                 for the respective VT TTY name,
                                 e.g. <filename>autovt@tty4.service</filename>. By
                                 <filename>autovt@.service</filename>
                                 for the respective VT TTY name,
                                 e.g. <filename>autovt@tty4.service</filename>. By

-                                default
+                                default,

                                 <filename>autovt@.service</filename>
                                 is linked to
                                 <filename>getty@.service</filename>,
                                 <filename>autovt@.service</filename>
                                 is linked to
                                 <filename>getty@.service</filename>,


@@ -92,7 +92,7 @@
                                 <literal>gettys</literal> are
                                 available on the VTs. If a VT is
                                 already used by some other subsystem
                                 <literal>gettys</literal> are
                                 available on the VTs. If a VT is
                                 already used by some other subsystem

-                                (for example a graphical login) this
+                                (for example a graphical login), this

                                 kind of activation will not be
                                 attempted. Note that the VT configured
                                 in <varname>ReserveVT=</varname> is
                                 kind of activation will not be
                                 attempted. Note that the VT configured
                                 in <varname>ReserveVT=</varname> is


@@ -103,7 +103,7 @@
                                 directive. Defaults to 6. When set to
                                 0, automatic spawning of
                                 <literal>autovt</literal> services is
                                 directive. Defaults to 6. When set to
                                 0, automatic spawning of
                                 <literal>autovt</literal> services is

-                                disabled. </para></listitem>
+                                disabled.</para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>


@@ -116,14 +116,14 @@
                                 <filename>autovt@.service</filename>
                                 activation (see above). The VT
                                 selected with this option will be
                                 <filename>autovt@.service</filename>
                                 activation (see above). The VT
                                 selected with this option will be

-                                marked busy unconditionally so that no
+                                marked busy unconditionally, so that no

                                 other subsystem will allocate it. This
                                 functionality is useful to ensure that
                                 other subsystem will allocate it. This
                                 functionality is useful to ensure that

-                                regardless how many VTs are allocated
-                                by other subsystems one login
+                                regardless of how many VTs are allocated
+                                by other subsystems, one login

                                 <literal>getty</literal> is always
                                 <literal>getty</literal> is always

-                                available. Defaults to 6 (with other
-                                words: there'll always be a
+                                available. Defaults to 6 (in other
+                                words, there will always be a

                                 <literal>getty</literal> available on
                                 Alt-F6.). When set to 0, VT
                                 reservation is
                                 <literal>getty</literal> available on
                                 Alt-F6.). When set to 0, VT
                                 reservation is


@@ -161,11 +161,11 @@
                                 user sessions correctly report the
                                 idle status to the system. The system
                                 will execute the action after all
                                 user sessions correctly report the
                                 idle status to the system. The system
                                 will execute the action after all

-                                sessions reported that they are idle,
-                                and no idle inhibitor lock is active,
-                                and subsquently the time configured
+                                sessions report that they are idle,
+                                no idle inhibitor lock is active,
+                                and subsequently, the time configured

                                 with <varname>IdleActionSec=</varname>
                                 with <varname>IdleActionSec=</varname>

-                                (see below) has passed.</para>
+                                (see below) has expired.</para>

                                 </listitem>
                         </varlistentry>
 
                                 </listitem>
                         </varlistentry>
 


@@ -184,10 +184,10 @@
                                 <term><varname>KillExcludeUsers=</varname></term>
 
                                 <listitem><para>These settings take
                                 <term><varname>KillExcludeUsers=</varname></term>
 
                                 <listitem><para>These settings take

-                                space separated lists of user names
+                                space-separated lists of usernames

                                 that influence the effect of
                                 <varname>KillUserProcesses=</varname>. If
                                 that influence the effect of
                                 <varname>KillUserProcesses=</varname>. If

-                                not empty only processes of users
+                                not empty, only processes of users

                                 listed in
                                 <varname>KillOnlyUsers</varname> will
                                 be killed when they log out
                                 listed in
                                 <varname>KillOnlyUsers</varname> will
                                 be killed when they log out


@@ -197,7 +197,7 @@
                                 killed. <varname>KillExcludeUsers=</varname>
                                 defaults to <literal>root</literal>
                                 and takes precedence over
                                 killed. <varname>KillExcludeUsers=</varname>
                                 defaults to <literal>root</literal>
                                 and takes precedence over

-                                <varname>KillOnlyUsers=</varname>
+                                <varname>KillOnlyUsers=</varname>,

                                 which defaults to the empty list.</para></listitem>
                         </varlistentry>
 
                                 which defaults to the empty list.</para></listitem>
                         </varlistentry>
 


@@ -207,18 +207,34 @@
 
                                 <listitem><para>These settings control
                                 the default control group hierarchies
 
                                 <listitem><para>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
+                                <literal>name=systemd</literal> 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

                                 <varname>Controllers=</varname> and be
                                 reset to the root control group in all
                                 hierarchies listed in
                                 <varname>Controllers=</varname> and be
                                 reset to the root control group in all
                                 hierarchies listed in

-                                <varname>ResetControllers=</varname>. <varname>Controllers=</varname>
-                                defaults to the empty list,
+                                <varname>ResetControllers=</varname>.
+                                <varname>Controllers=</varname>
+                                defaults to the empty list.

                                 <varname>ResetControllers=</varname>
                                 defaults to
                                 <varname>ResetControllers=</varname>
                                 defaults to

-                                <literal>cpu</literal>.</para></listitem>
+                                <literal>cpu</literal>. Note that for
+                                all controllers that are not listed in
+                                either <varname>Controllers=</varname>
+                                or
+                                <varname>ResetControllers=</varname>,
+                                newly created sessions will be part of
+                                the control groups of the system
+                                service that created the
+                                session.</para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>


@@ -228,8 +244,8 @@
                                 time a system shutdown or sleep
                                 request is delayed due to an inhibitor
                                 lock of type <literal>delay</literal>
                                 time a system shutdown or sleep
                                 request is delayed due to an inhibitor
                                 lock of type <literal>delay</literal>

-                                being active -- before it is ignored
-                                and the operation executed
+                                being active before the inhibitor is
+                                ignored and the operation executes

                                 anyway. Defaults to
                                 5s.</para></listitem>
                         </varlistentry>
                                 anyway. Defaults to
                                 5s.</para></listitem>
                         </varlistentry>


@@ -254,11 +270,11 @@
                                 <literal>hibernate</literal>,
                                 <literal>hybrid-sleep</literal> and
                                 <literal>lock</literal>. If
                                 <literal>hibernate</literal>,
                                 <literal>hybrid-sleep</literal> and
                                 <literal>lock</literal>. If

-                                <literal>ignore</literal> logind will
+                                <literal>ignore</literal>, logind will

                                 never handle these keys. If
                                 never handle these keys. If

-                                <literal>lock</literal> all running
-                                sessions will be screen
-                                locked. Otherwise the specified action
+                                <literal>lock</literal>, all running
+                                sessions will be screen-locked; otherwise,
+                                the specified action

                                 will be taken in the respective
                                 event. Only input devices with the
                                 <literal>power-switch</literal> udev
                                 will be taken in the respective
                                 event. Only input devices with the
                                 <literal>power-switch</literal> udev


@@ -286,17 +302,17 @@
                                 sleep keys and the lid switch are
                                 subject to inhibitor locks. These
                                 settings take boolean arguments. If
                                 sleep keys and the lid switch are
                                 subject to inhibitor locks. These
                                 settings take boolean arguments. If

-                                <literal>off</literal> the inhibitor
+                                <literal>off</literal>, the inhibitor

                                 locks taken by applications in order
                                 to block the requested operation are
                                 locks taken by applications in order
                                 to block the requested operation are

-                                respected, if <literal>on</literal>
+                                respected. If <literal>on</literal>,

                                 the requested operation is executed in
                                 any
                                 case. <varname>PowerKeyIgnoreInhibited=</varname>,
                                 <varname>SuspendKeyIgnoreInhibited=</varname>
                                 and
                                 <varname>HibernateKeyIgnoreInhibited=</varname>
                                 the requested operation is executed in
                                 any
                                 case. <varname>PowerKeyIgnoreInhibited=</varname>,
                                 <varname>SuspendKeyIgnoreInhibited=</varname>
                                 and
                                 <varname>HibernateKeyIgnoreInhibited=</varname>

-                                defaults to <literal>off</literal>,
+                                default to <literal>off</literal>.

                                 <varname>LidSwitchIgnoreInhibited=</varname>
                                 defaults to
                                 <literal>yes</literal>. This means
                                 <varname>LidSwitchIgnoreInhibited=</varname>
                                 defaults to
                                 <literal>yes</literal>. This means


@@ -315,7 +331,7 @@
 
                 <para>Note that <varname>KillUserProcesses=1</varname>
                 is a weaker version of
 
                 <para>Note that <varname>KillUserProcesses=1</varname>
                 is a weaker version of

-                <varname>kill-session-processes=1</varname> which may
+                <varname>kill-session-processes=1</varname>, which may

                 be configured per-service for
                 <citerefentry><refentrytitle>pam_systemd</refentrytitle><manvolnum>8</manvolnum></citerefentry>. The
                 latter kills processes of a session as soon as it
                 be configured per-service for
                 <citerefentry><refentrytitle>pam_systemd</refentrytitle><manvolnum>8</manvolnum></citerefentry>. The
                 latter kills processes of a session as soon as it