From b67f2d68ef9267e8893c0307174b538e327d772a Mon Sep 17 00:00:00 2001
From: Bryan Kadzban <bryan@linuxfromscratch.org>
Date: Wed, 27 Jan 2010 04:55:48 +0000
Subject: [PATCH] Move from /etc/modprobe.conf to /etc/modprobe.d/*.conf, since
 module-init-tools now complains about the former.  Fixes #2560.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9167 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  5 +++++
 chapter07/udev.xml      |  9 +++++----
 chapter08/kernel.xml    | 30 ++++++++++++++++--------------
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 764e65a81..729e0c50b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -45,6 +45,11 @@
           rules instead. Fixes
           <ulink url="&lfs-ticket-root;2527">#2527</ulink>.</para>
         </listitem>
+        <listitem>
+          <para>[bryan] Use /etc/modprobe.d/*.conf files instead of a single
+          /etc/modprobe.conf file, since module-init-tools now warns.  Fixes
+          <ulink url="&lfs-ticket-root;2560">#2560</ulink>.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 
diff --git a/chapter07/udev.xml b/chapter07/udev.xml
index 468a5035f..8084b9ea6 100644
--- a/chapter07/udev.xml
+++ b/chapter07/udev.xml
@@ -235,8 +235,9 @@
       enhances the functionality of <emphasis>snd-pcm</emphasis> by making the
       sound cards available to OSS applications), configure
       <command>modprobe</command> to load the wrapper after Udev loads the
-      wrapped module. To do this, add an <quote>install</quote> line in
-      <filename>/etc/modprobe.conf</filename>. For example:</para>
+      wrapped module. To do this, add an <quote>install</quote> line in any
+      <filename>/etc/modprobe.d/<replaceable>&lt;filename&gt;</replaceable>.conf</filename>
+      file. For example:</para>
 
 <screen role="nodump"><literal>install snd-pcm /sbin/modprobe -i snd-pcm ; \
     /sbin/modprobe snd-pcm-oss ; true</literal></screen>
@@ -252,8 +253,8 @@
     <sect3>
       <title>Udev loads some unwanted module</title>
 
-      <para>Either don't build the module, or blacklist it in
-      <filename>/etc/modprobe.conf</filename> file as done with the
+      <para>Either don't build the module, or blacklist it in a
+      <filename>/etc/modprobe.d/blacklist.conf</filename> file as done with the
       <emphasis>forte</emphasis> module in the example below:</para>
 
 <screen role="nodump"><literal>blacklist forte</literal></screen>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index a2b737b8d..8cb0b89c7 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -100,10 +100,11 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>If using kernel modules, an <filename>/etc/modprobe.conf</filename>
-    file may be needed. Information pertaining to modules and kernel
-    configuration is located in <xref linkend="ch-scripts-udev"/> and in the
-    kernel documentation in the <filename
+    <para>If using kernel modules, module configuration in <filename
+    class="directory">/etc/modprobe.d</filename> may be required.
+    Information pertaining to modules and kernel configuration is
+    located in <xref linkend="ch-scripts-udev"/> and in the kernel
+    documentation in the <filename
     class="directory">linux-&linux-version;/Documentation</filename> directory.
     Also, <filename>modprobe.conf(5)</filename> may be of interest.</para>
 
@@ -184,25 +185,26 @@ cp -r Documentation/* /usr/share/doc/linux-&linux-version;</userinput></screen>
     <title>Configuring Linux Module Load Order</title>
 
     <indexterm zone="conf-modprobe">
-      <primary sortas="e-/etc/modprobe.conf">/etc/modprobe.conf</primary>
+      <primary sortas="e-/etc/modprobe.d/usb.conf">/etc/modprobe.d/usb.conf</primary>
     </indexterm>
 
-    <para>The <filename>/etc/modprobe.conf</filename> file needs to be created
-    so that if the USB drivers (ehci_hcd, ohci_hcd and uhci_hcd) have been built
-    as modules, they will be loaded in the correct order; ehci_hcd needs to be
-    loaded prior to ohci_hcd and uhci_hcd in order to avoid a warning being
-    output at boot time.</para>
+    <para>The <filename>/etc/modprobe.d/usb.conf</filename> file needs to be
+    created so that if the USB drivers (ehci_hcd, ohci_hcd and uhci_hcd) have
+    been built as modules, they will be loaded in the correct order; ehci_hcd
+    needs to be loaded prior to ohci_hcd and uhci_hcd in order to avoid a
+    warning being output at boot time.</para>
 
-    <para>Create a new file <filename>/etc/modprobe.conf</filename> by running
+    <para>Create a new file <filename>/etc/modprobe.d/usb.conf</filename> by running
     the following:</para>
 
-<screen><userinput>cat &gt; /etc/modprobe.conf &lt;&lt; "EOF"
-<literal># Begin /etc/modprobe.conf
+<screen><userinput>install -v -m755 /etc/modprobe.d
+cat &gt; /etc/modprobe.d/usb.conf &lt;&lt; "EOF"
+<literal># Begin /etc/modprobe.d/usb.conf
 
 install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe -i ohci_hcd ; true
 install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe -i uhci_hcd ; true
 
-# End /etc/modprobe.conf</literal>
+# End /etc/modprobe.d/usb.conf</literal>
 EOF</userinput></screen>
 
   </sect2>