diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-10-29 05:10:48 -0700 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-26 19:11:37 -0500 |
| commit | e8461023531de98ac6a49eff9d6ffeff6315249c (patch) | |
| tree | 99230bec08ffa8c0c60a1c3c018833793b41140f /man/logind.conf.xml | |
| parent | 7f0a55d4325f7df91f91b3b818f61f97d78df14a (diff) | |
logind: Support logind.conf.d directories in the usual search paths
This makes it possible to drop in logind configuration snippets from a
package or other configuration management mechanism.
Add documentation to the header of /etc/logind.conf pointing the user at
/etc/logind.conf.d/*.conf.
Introduce a new helper, conf_parse_many, to parse configuration files in
a search path.
Diffstat (limited to 'man/logind.conf.xml')
| -rw-r--r-- | man/logind.conf.xml | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/man/logind.conf.xml b/man/logind.conf.xml index d37fcba58..0b35f51eb 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -44,18 +44,41 @@ <refnamediv> <refname>logind.conf</refname> - <refpurpose>Login manager configuration file</refpurpose> + <refpurpose>Login manager configuration files</refpurpose> </refnamediv> <refsynopsisdiv> <para><filename>/etc/systemd/logind.conf</filename></para> + <para><filename>/etc/systemd/logind.conf.d/*.conf</filename></para> + <para><filename>/run/systemd/logind.conf.d/*.conf</filename></para> + <para><filename>/usr/lib/systemd/logind.conf.d/*.conf</filename></para> </refsynopsisdiv> <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>These files configure various parameters of the systemd login manager, <citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para> + + <para>Each configuration file shall be named in the style of + <filename><replaceable>filename</replaceable>.conf</filename>. + Files in <filename>/etc/</filename> override files with the + same name in <filename>/usr/lib/</filename> and + <filename>/run/</filename>. Files in + <filename>/run/</filename> override files with the same name in + <filename>/usr/lib/</filename>. Packages should install their + configuration files in <filename>/usr/lib/</filename>. Files in + <filename>/etc/</filename> are reserved for the local + administrator, who may use this logic to override the + configuration files installed by vendor packages. All + configuration files are sorted by their filename in + lexicographic order, regardless of which of the directories + they reside in. If multiple files specify the same option, the + entry in the file with the lexicographically latest name will + be applied; entries in any <filename>logind.conf.d</filename> + file override entries in + <filename>/etc/systemd/logind.conf</filename>. It is + recommended to prefix all filenames with a two-digit number and + a dash, to simplify the ordering of the files.</para> </refsect1> <refsect1> |