headers: fix git URLs for source files

[elogind.git] / man / modules-load.d.xml

diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index 77a2860553067970271b396bf8721fc01defc7b7..b63366347540725e53c6182f2471896fddfbf6c8 100644 (file)
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -4,7 +4,7 @@
 <!--
   This file is part of systemd.
 
 <!--
   This file is part of systemd.
 

-  Copyright 2010 Brandon Philips
+  Copyright 2011 Lennart Poettering

 
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by
 
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by


@@ -46,14 +46,16 @@
         </refnamediv>
 
         <refsynopsisdiv>
         </refnamediv>
 
         <refsynopsisdiv>

+                <para><filename>/usr/lib/modules-load.d/*.conf</filename></para>

                 <para><filename>/etc/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
         </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/&lt;program&gt;.conf</filename>. Note
                kernel modules to load during boot in a static list.
                Each configuration file is named in the style of
                <filename>/etc/modules-load.d/&lt;program&gt;.conf</filename>. Note


@@ -72,15 +74,30 @@
                newlines. Empty lines and lines whose first
                non-whitespace character is # or ; are ignored.</para>
 
                newlines. Empty lines and lines whose first
                non-whitespace character is # or ; are ignored.</para>
 

+                <para>Each configuration file is named in the style of
+                <filename>&lt;program&gt;.conf</filename>.
+                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>
                 <title>Example</title>
                 <example>
         </refsect1>
 
         <refsect1>
                 <title>Example</title>
                 <example>

-                        <title>/etc/modules-load.d/uinput.conf example:</title>
+                        <title>/etc/modules-load.d/virtio-net.conf example:</title>

 
 

-                        <programlisting># Load uinput.ko at boot
-uinput</programlisting>
+                        <programlisting># Load virtio-net.ko at boot
+virtio-net</programlisting>

                 </example>
         </refsect1>
 
                 </example>
         </refsect1>