diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/binfmt.d.xml | 26 | ||||
| -rw-r--r-- | man/modules-load.d.xml | 17 | ||||
| -rw-r--r-- | man/sysctl.d.xml | 15 |
3 files changed, 48 insertions, 10 deletions
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml index 64c27554e6..5a8803f661 100644 --- a/man/binfmt.d.xml +++ b/man/binfmt.d.xml @@ -46,20 +46,20 @@ </refnamediv> <refsynopsisdiv> + <para><filename>/usr/lib/binfmt.d/*.conf</filename></para> <para><filename>/etc/binfmt.d/*.conf</filename></para> + <para><filename>/run/binfmt.d/*.conf</filename></para> </refsynopsisdiv> <refsect1> <title>Description</title> <para><command>systemd</command> uses - <filename>/etc/binfmt.d/</filename> to configure + files from the above directories to configure additional binary formats to register during boot in the kernel. Each configuration file is named in the style of - <filename>/etc/binfmt.d/<program>.conf</filename>.</para> - - + <filename><program>.conf</filename>.</para> </refsect1> <refsect1> @@ -75,11 +75,19 @@ ignored. Note that this means you may not use ; and # as delimiter in binary format rules.</para> - <para>Configuration files are loaded in alphabetical - order. To ensure that a specific rule takes precedence - over another place it in a file with an alphabetically - later name.</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> diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml index 34076916da..b2f15dc7b6 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> diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml index 8f336dc0dd..51afbfa77a 100644 --- a/man/sysctl.d.xml +++ b/man/sysctl.d.xml @@ -46,7 +46,9 @@ </refnamediv> <refsynopsisdiv> + <para><filename>/usr/lib/sysctl.d/*.conf</filename></para> <para><filename>/etc/sysctl.d/*.conf</filename></para> + <para><filename>/run/sysctl.d/*.conf</filename></para> </refsynopsisdiv> <refsect1> @@ -71,6 +73,19 @@ <para>Note that both / and . are accepted as separators in sysctl variable names.</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> |