X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fmodules-load.d.xml;h=b63366347540725e53c6182f2471896fddfbf6c8;hp=34076916da26fe05fc29752ab6e5e8fb70725218;hb=8ab49c12dcab02d9d83e63a93676d4fc8f709516;hpb=c91faef3b3facfdf13282aee957af25dd555890b
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index 34076916d..b63366347 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -46,14 +46,16 @@
+ /usr/lib/modules-load.d/*.conf
/etc/modules-load.d/*.conf
+ /run/modules-load.d/*.conf
Description
systemd uses
- /etc/modules-load.d/ to configure
+ files from the above directories to configure
kernel modules to load during boot in a static list.
Each configuration file is named in the style of
/etc/modules-load.d/<program>.conf. Note
@@ -72,6 +74,21 @@
newlines. Empty lines and lines whose first
non-whitespace character is # or ; are ignored.
+ Each configuration file is named in the style of
+ <program>.conf.
+ Files in /etc/ overwrite
+ files with the same name in /usr/lib/.
+ Files in /run overwrite files with
+ the same name in /etc/ and
+ /usr/lib/. Packages should install their
+ configuration files in /usr/lib/, files
+ in /etc/ are reserved for the local
+ administration, which possibly decides to overwrite the
+ configurations installed from packages. All files are sorted
+ by filename in alphabetical order, regardless in which of the
+ directories they reside, to ensure that a specific
+ configuration file takes precedence over another file with
+ an alphabetically later name.