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=33c466f926b0ffb3b80a582f68f4ae417b37aae9;hp=47acc08e63541668822f24aa54c66d76b03fbe8b;hb=03ee5c38cb0da193dd08733fb4c0c2809cee6a99;hpb=a7c64469b68f442bcaaf771ac14a88c1b2a08b29

diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index 47acc08e6..33c466f92 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -4,22 +4,22 @@
 <!--
   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">
+<refentry id="modules-load.d" conditional='HAVE_KMOD'>
 
         <refentryinfo>
                 <title>modules-load.d</title>
@@ -47,40 +47,63 @@
 
         <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
-		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
-		module loading by PCI ID, by DMI ID or similar
-		triggers configured in the kernel modules themselves
-		instead of relying on static configuration like
-		this.</para>
+                <para><citerefentry><refentrytitle>systemd-modules-load.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                reads files from the above directories which contain
+                kernel modules to load during boot in a static list.
+                Each configuration file is named in the style of
+                <filename>/etc/modules-load.d/<replaceable>program</replaceable>.conf</filename>. Note
+                that it is usually a better idea to rely on the
+                automatic module loading by PCI IDs, USB IDs, DMI IDs
+                or similar triggers encoded in the kernel modules
+                themselves instead of static configuration like
+                this. In fact, most modern kernel modules are prepared
+                for automatic loading already.</para>
         </refsect1>
 
         <refsect1>
-		<title>Configuration Format</title>
-
-		<para>The configuration files should simply contain a
-		list of kernel modul names to load, seperated by
-		newlines. Empty lines and lines whose first
-		non-whitespace character is # or ; are ignored.</para>
-
+                <title>Configuration Format</title>
+
+                <para>The configuration files should simply contain a
+                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 shall be named in the
+                style of <filename><replaceable>program</replaceable>.conf</filename>.
+                Files in <filename>/etc/</filename> override files
+                with the same name in <filename>/usr/lib/</filename>
+                and <filename>/run/</filename>. Files in
+                <filename>/run/</filename> override files with the
+                same name in <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
+                administrator, who may use this logic to override the
+                configuration files installed from vendor
+                packages.</para>
+
+                <para>If the administrator wants to disable a
+                configuration file supplied by the vendor, the
+                recommended way is to place a symlink to
+                <filename>/dev/null</filename> in
+                <filename>/etc/modules-load.d/</filename> bearing the
+                same filename.</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>
 
@@ -88,6 +111,8 @@ uinput</programlisting>
                 <title>See Also</title>
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd-modules-load.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd-delta</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>modprobe</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                 </para>
         </refsect1>