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=01013e0222e8b95101436afd598373a4a05e43b3;hp=47acc08e63541668822f24aa54c66d76b03fbe8b;hb=78d54bd42b87818f5d0ef862d247f9db4844fadd;hpb=a7c64469b68f442bcaaf771ac14a88c1b2a08b29

diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index 47acc08e6..01013e022 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -4,19 +4,19 @@
 <!--
   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
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 <refentry id="modules-load.d">
@@ -47,17 +47,19 @@
 
         <refsynopsisdiv>
                 <para><filename>/etc/modules-load.d/*.conf</filename></para>
+                <para><filename>/run/modules-load.d/*.conf</filename></para>
+                <para><filename>/usr/lib/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/&lt;program&gt;.conf</filename>. Note
-		that it is usally a better idea to use the automatic
+		that it is usually a better idea to use the automatic
 		module loading by PCI ID, by DMI ID or similar
 		triggers configured in the kernel modules themselves
 		instead of relying on static configuration like
@@ -68,19 +70,34 @@
 		<title>Configuration Format</title>
 
 		<para>The configuration files should simply contain a
-		list of kernel modul names to load, seperated by
+		list of kernel module names to load, separated by
 		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> override
+                files with the same name in <filename>/usr/lib/</filename>.
+                Files in <filename>/run</filename> override 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 override 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>
-                        <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>