X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fstandard-conf.xml;h=807702493c7c92e9fe319fbf04fd779d7cd01ab8;hb=8df592e92ab19c628d558f621f2dfbe9a3589c91;hp=004f53f70c8b28e04243c19da2c3f18bee0c200b;hpb=884c10fbec1b8247dc620026b5e1b7a5cac0c2eb;p=elogind.git diff --git a/man/standard-conf.xml b/man/standard-conf.xml index 004f53f70..807702493 100644 --- a/man/standard-conf.xml +++ b/man/standard-conf.xml @@ -30,23 +30,25 @@ the vendor, the recommended way is to place a symlink to /dev/null in the configuration directory in /etc/, with the same filename as the vendor - configuration file. + configuration file. If the vendor configuration file is included in + the initrd image, the image has to be regenerated. + Configuration Directories and Precedence - Default configuration is defined during compilation, so a + The default configuration is defined during compilation, so a configuration file is only needed when it is necessary to deviate - from those defaults. By default the configuration file in - /etc/systemd/ contains commented out entries + from those defaults. By default, the configuration file in + /etc/elogind/ contains commented out entries showing the defaults as a guide to the administrator. This file can be edited to create local overrides. When packages need to customize the configuration, they can install configuration snippets in - /usr/lib/systemd/*.conf.d/. Files in + /usr/lib/elogind/*.conf.d/. Files in /etc/ are reserved for the local administrator, who may use this logic to override the configuration files installed by vendor packages. The main