21 files changed, 60 insertions, 54 deletions
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 0f49320c6..3010805b7 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -35,16 +35,6 @@ documentation, issue the following commands:</para>
 sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
     Makefile.in</userinput></screen>
 
-<para>The following patch fixes various issues, including a problem where Bash
-will sometimes only show 33 characters on a line, then wrap to the next:</para>
-
-<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
-
-<para>Bash also has issues when compiled against newer versions of Glibc.  The
-following patch resolves this problem:</para>
-
-<screen><userinput>patch -Np1 -i ../&bash-avoid_WCONTINUED-patch;</userinput></screen>
-
 <para>Prepare Bash for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin \
diff --git a/chapter06/file.xml b/chapter06/file.xml
index 5f3948bf2..f89f7674b 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -37,6 +37,8 @@ GCC, Glibc, Grep, Make, Sed, and Zlib</seg></seglistitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 2c1d59519..5cca20be0 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -47,12 +47,6 @@ and linker cannot be adjusted before the Glibc install because the
 Glibc autoconf tests would give false results and defeat the goal
 of achieving a clean build.</para>
 
-<para>The linuxthreads tarball contains the man pages for the
-threading libraries installed by Glibc.  Unpack the tarball from
-within the Glibc source directory:</para>
-
-<screen><userinput>tar -xvf ../glibc-linuxthreads-&glibc-version;.tar.bz2</userinput></screen>
-
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
 
@@ -176,15 +170,6 @@ GCC and Gettext tests to pass, and the <command>watch</command> program
 attempts to circumvent these restrictions are documented in
 internationalization-related hints.</para>
 
-<para>Build the linuxthreads man pages, which are a great reference
-on the threading API (applicable to NPTL as well):</para>
-
-<screen><userinput>make -C ../glibc-&glibc-version;/linuxthreads/man</userinput></screen>
-
-<para>Install these pages:</para>
-
-<screen><userinput>make -C ../glibc-&glibc-version;/linuxthreads/man install</userinput></screen>
-
 </sect2>
 
 <sect2 id="conf-glibc" role="configuration"><title>Configuring Glibc</title>
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index 59dd8c90d..a2d8cb7e2 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -41,6 +41,8 @@ to contain the default paper size. For users in the United States,
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 1730df998..74d7d7bf9 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -49,6 +49,8 @@ that the new location gets placed into the script:</para>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml
index 8e6cd6368..bbc9cfe95 100644
--- a/chapter06/hotplug.xml
+++ b/chapter06/hotplug.xml
@@ -32,6 +32,8 @@ running kernel.</para>
 <sect2 role="installation">
 <title>Installation of Hotplug</title>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the Hotplug package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/iana-etc.xml b/chapter06/iana-etc.xml
index 54b653bd2..38ac0b8de 100644
--- a/chapter06/iana-etc.xml
+++ b/chapter06/iana-etc.xml
@@ -33,6 +33,8 @@ correct formats for the <filename>/etc/protocols</filename> and
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index abba0f217..dabe959d6 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -88,6 +88,8 @@ servers.</para></listitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 1aea0339d..66d1ea86c 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -63,6 +63,8 @@
     </varlistentry>
     </variablelist>
 
+    <para>This package does not come with a test suite.</para>
+
     <para>Install the package:</para>
 
     <screen><userinput>make SBINDIR=/sbin install</userinput></screen>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 4e28dba9c..52e8a734c 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -41,6 +41,8 @@ when compiling with GCC-&gcc-version;:</para>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/less.xml b/chapter06/less.xml
index a47709ee4..817a6c67e 100644
--- a/chapter06/less.xml
+++ b/chapter06/less.xml
@@ -46,6 +46,8 @@ GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/man.xml b/chapter06/man.xml
index efc322f64..371985d2e 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -62,6 +62,8 @@ class="directory">/etc</filename> directory.</para></listitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/mktemp.xml b/chapter06/mktemp.xml
index 7dcd5d1f5..ee47463e6 100644
--- a/chapter06/mktemp.xml
+++ b/chapter06/mktemp.xml
@@ -54,6 +54,8 @@ functions from the system C library.</para></listitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install
diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml
index 699f1a85b..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 &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/chapter06/procps.xml b/chapter06/procps.xml
index 7969900f0..4973a7955 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -32,6 +32,8 @@ Make, and Ncurses</seg></seglistitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index f09f726b1..ae50c7575 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -50,6 +50,8 @@ package.</para></listitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index 53ca9dbd0..5d4e08c29 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -29,30 +29,26 @@ GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Readline</title>
 
-<para>The following patch includes a fix for a problem where Readline sometimes
-only shows 33 characters on a line and then wraps to the next line. It also
-includes other fixes recommended by the Readline author.</para>
-
-<screen><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
-
 <para>Prepare Readline for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
 
 <para>Compile the package:</para>
 
-<screen><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
+<screen><userinput>make SHLIB_LIBS=-lncurses</userinput></screen>
 
 <para>The meaning of the make option:</para>
 
 <variablelist>
 <varlistentry>
-<term><parameter>SHLIB_XLDFLAGS=-lncurses</parameter></term>
+<term><parameter>SHLIB_LIBS=-lncurses</parameter></term>
 <listitem><para>This option forces Readline to link against the
 <filename class="libraryfile">libncurses</filename> library.</para></listitem>
 </varlistentry>
 </variablelist>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index 5102dd3e8..01c2a6d45 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -28,7 +28,7 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Texinfo</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Sed</title>
 
-<para>By default, Sed installs its man page in
+<para>By default, Sed installs its HTML documentation in
 <filename class="directory">/usr/share/doc</filename>.  Alter this to
 <filename class="directory">/usr/share/doc/sed-&sed-version;</filename> by
 applying the following <command>sed</command>:</para>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 2a4d39693..810c90c19 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -46,12 +46,14 @@ prior to building Shadow. Then add <parameter>--with-libcrack</parameter> to the
 <para>Disable the installation of the <command>groups</command> program and its man page, as Coreutils provides a better version:</para>
 
 <screen><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile
-sed -i '/groups/d' man/Makefile</userinput></screen>
+find man -name Makefile -exec sed -i '/groups/d' {} \;</userinput></screen>
 
 <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index 8c3db5c12..fb422e1c8 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -37,6 +37,8 @@ Sysklogd with Linux 2.6 series kernels</para>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 5e0accc4d..a322e69ec 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -46,6 +46,8 @@ instead:</para>
 
 <screen><userinput>make -C src</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make -C src install</userinput></screen>