Upgrade to module-init-tools 3.2.1

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7189 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

4 files changed, 27 insertions, 21 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e453aad5d..31f6138e3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -114,6 +114,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>November 26, 2005 [matt]: Upgrade to module-init-tools 3.2.1.
+</para></listitem>
+
 <listitem><para>November 26, 2005 [matt]: Prevent installing the
 internationalized man pages for Shadow's <command>groups</command> binary
 (thanks to Randy McMurchy for the report).</para></listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index cc20af186..65449e17a 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -291,7 +291,7 @@ url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Module-Init-Tools (&module-init-tools-version;) - 128 KB:</term>
+<term>Module-Init-Tools (&module-init-tools-version;) - 164 KB:</term>
 <listitem>
 <para><ulink url="&kernel;linux/utils/kernel/module-init-tools/"/></para>
 </listitem>
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>
diff --git a/general.ent b/general.ent
index d60091716..f7c672be6 100644
--- a/general.ent
+++ b/general.ent
@@ -66,7 +66,7 @@
 <!ENTITY man-version "1.6b">
 <!ENTITY man-pages-version "2.14">
 <!ENTITY mktemp-version "1.5">
-<!ENTITY module-init-tools-version "3.1">
+<!ENTITY module-init-tools-version "3.2.1">
 <!ENTITY ncurses-version "5.5">
 <!ENTITY patch-version "2.5.4">
 <!ENTITY perl-version "5.8.7">