diff options
| author |   Kay Sievers <kay.sievers@vrfy.org> | 2011-04-25 20:41:47 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-04-25 20:41:47 +0200 |
| commit | db1413d7380acacc4e50faf801ca0d401da89764 (patch) | |
| tree | 5525908e3b419149c0458348210fedf37eafc703 /man/modules-load.d.xml | |
| parent | manager: mkdir /run/systemd/system when starting up (diff) | |
| download | systemd-db1413d7380acacc4e50faf801ca0d401da89764.tar.gz systemd-db1413d7380acacc4e50faf801ca0d401da89764.tar.bz2 systemd-db1413d7380acacc4e50faf801ca0d401da89764.zip | |
sysctl.d, binfmt.d, modules-load.d: switch to stacked config dirs in /lib, /etc, /run
Diffstat (limited to 'man/modules-load.d.xml')
| -rw-r--r-- | man/modules-load.d.xml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml index 34076916d..b2f15dc7b 100644 --- a/man/modules-load.d.xml +++ b/man/modules-load.d.xml @@ -46,14 +46,16 @@ </refnamediv> <refsynopsisdiv> + <para><filename>/usr/lib/modules-load.d/*.conf</filename></para> <para><filename>/etc/modules-load.d/*.conf</filename></para> + <para><filename>/run/modules-load.d/*.conf</filename></para> </refsynopsisdiv> <refsect1> <title>Description</title> <para><command>systemd</command> uses - <filename>/etc/modules-load.d/</filename> 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 <filename>/etc/modules-load.d/<program>.conf</filename>. Note @@ -72,6 +74,19 @@ newlines. Empty lines and lines whose first non-whitespace character is # or ; are ignored.</para> + <para>Files in <filename>/etc/</filename> overwrite + files with the same name in <filename>/usr/lib/</filename>. + Files in <filename>/run</filename> overwrite files with + the same name in <filename>/etc/</filename> and + <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 + 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.</para> </refsect1> <refsect1> |