From 9b6a7d0902d7774f62ba6fde97ee8dab3408841b Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sat, 26 Nov 2005 20:20:01 +0000
Subject: Upgrade to module-init-tools 3.2.1

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7189 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/module-init-tools.xml | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml
index 548687df1..947957465 100644
--- a/chapter06/module-init-tools.xml
+++ b/chapter06/module-init-tools.xml
@@ -16,7 +16,7 @@ modules in Linux kernels greater than or equal to version 2.5.47.</para>
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
 <segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>4.9 MB</seg></seglistitem>
+<seglistitem><seg>0.3 SBU</seg><seg>3.3 MB</seg></seglistitem>
 </segmentedlist>
 
 <segmentedlist>
@@ -29,32 +29,28 @@ Coreutils, Diffutils, Flex, GCC, Glibc, Grep, M4, Make, and Sed</seg></seglistit
 <sect2 role="installation">
 <title>Installation of Module-Init-Tools</title>
 
-<para>Module-Init-Tools attempts to rewrite its
-<filename>modprobe.conf</filename> man page during the build process. This is
-unnecessary and also relies on <command>docbook2man</command> &mdash; which is not
-installed in LFS. Run the following command to avoid this:</para>
+<para>Issue the following commands to perform the tests (note that the
+<command>make distclean</command> command is required to clean up the source
+tree, as the source gets recompiled as part of the testing process):</para>
 
-<screen><userinput>touch modprobe.conf.5</userinput></screen>
-
-<para>If you wish to run the test suite for Module-Init-Tools, you will need to
-download the separate testsuite tarball.  Issue the following commands to
-perform the tests (note that the <command>make distclean</command> command is
-required to clean up the source tree, as the source gets recompiled as part of
-the testing process):</para>
-
-<screen><userinput>tar -xvf ../module-init-tools-testsuite-&module-init-tools-version;.tar.bz2 --strip-components=1 &amp;&amp;
-./configure &amp;&amp;
+<screen><userinput>./configure &amp;&amp;
 make check &amp;&amp;
 make distclean</userinput></screen>
 
 <para>Prepare Module-Init-Tools for compilation:</para>
 
-<screen><userinput>./configure --prefix="" --enable-zlib</userinput></screen>
+<screen><userinput>./configure --prefix="" --mandir=/usr/share/man \
+  --enable-zlib</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
 <variablelist>
 <varlistentry>
+<term><parameter>--mandir=/usr/share/man</parameter></term>
+<listitem><para>This ensures the man pages are installed in the correct
+location.</para></listitem>
+</varlistentry>
+<varlistentry>
 <term><parameter>--enable-zlib</parameter></term>
 <listitem><para>This allows the Module-Init-Tools package to handle compressed
 kernel modules.</para></listitem>
@@ -76,9 +72,8 @@ kernel modules.</para></listitem>
 
 <segmentedlist>
 <segtitle>Installed programs</segtitle>
-<seglistitem><seg>depmod, insmod,
-insmod.static, lsmod (link to insmod), modinfo, modprobe (link to
-insmod), and rmmod (link to insmod)</seg></seglistitem>
+<seglistitem><seg>depmod, generate-modprobe.conf, insmod,
+insmod.static, lsmod, modinfo, modprobe, and rmmod</seg></seglistitem>
 </segmentedlist>
 
 <variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -95,6 +90,14 @@ automatically load the required modules</para>
 </listitem>
 </varlistentry>
 
+<varlistentry id="generate-modprobe.conf">
+<term><command>generate-modprobe.conf</command></term>
+<listitem>
+<para>Creates a modprobe.conf file from an existing 2.2 or 2.4 module setup</para>
+<indexterm zone="ch-system-module-init-tools generate-modprobe.conf"><primary sortas="b-generate-modprobe.conf">generate-modprobe.conf</primary></indexterm>
+</listitem>
+</varlistentry>
+
 <varlistentry id="insmod">
 <term><command>insmod</command></term>
 <listitem>
-- 
cgit v1.2.3-54-g00ecf