X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fstandard-conf.xml;h=15268030f8648d5feff3605e6ddba1d02680f5e9;hb=c11dd1c49b997de4d222f302070387f82d8068ca;hp=36af45927d4f59f3f7eac4d1bbba6a2a441208c5;hpb=e93549ef29c4123d9ee45acb5815048390201e49;p=elogind.git diff --git a/man/standard-conf.xml b/man/standard-conf.xml index 36af45927..15268030f 100644 --- a/man/standard-conf.xml +++ b/man/standard-conf.xml @@ -30,7 +30,9 @@ 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. + @@ -39,14 +41,14 @@ 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 + /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 @@ -54,7 +56,7 @@ directories, and has the lowest precedence; entries in a file in any configuration directory override entries in the single configuration file. Files in the - logind.conf.d/ configuration subdirectories + *.conf.d/ configuration subdirectories are sorted by their filename in lexicographic order, regardless of which of the subdirectories they reside in. If multiple files specify the same option, the entry in the file with the