Cleaning up the PTY business for the test suites.

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

3 files changed, 16 insertions, 40 deletions

diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index eff1c295b..4a168fac6 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -99,16 +99,12 @@ followed our example.</para>
 <blockquote><screen>filesystem devpts not supported by kernel</screen></blockquote>
 
 <para>The most likely cause for this is that your host system's kernel was
-compiled without support for the devpts file system. You can check which file
-systems your kernel supports by peeking into its internals with
-<command>cat /proc/filesystems</command>. If a file system type named
-<emphasis>devfs</emphasis> is listed there, then we'll be able to work around
-the problem by mounting the host's devfs file system on top of the new
-<filename>/dev</filename> structure which we'll create later on in the section
-on <xref linkend="ch-system-MAKEDEV"/>. If devfs was not listed, do not worry
-because there is yet a third way to get PTYs working inside the chroot
-environment. We'll cover this shortly in the aforementioned
-<xref linkend="ch-system-MAKEDEV"/> section.</para>
+compiled without support for the devpts file system (you can check which file
+systems your kernel supports with <command>cat /proc/filesystems</command>,
+for example). A few PTYs are needed to be able to run the suites for Binutils
+and GCC later on. If your kernel does not support devpts, do not worry, there
+is another way to get them working inside the chroot environment. We'll cover
+this shortly in the <xref linkend="ch-system-MAKEDEV"/> section.</para>
 
 <para>Remember that if for any reason you stop working on your LFS, and start
 again later, it's important to check that these file systems are mounted again
diff --git a/chapter06/makedev.xml b/chapter06/makedev.xml
index 271ebef80..a83f07885 100644
--- a/chapter06/makedev.xml
+++ b/chapter06/makedev.xml
@@ -65,25 +65,16 @@ you are satisfied, run the script to create the device files:</para>
 
 <para>If you had success with mounting the devpts file system earlier in <xref
 linkend="ch-system-proc"/>, you can continue with the next section. If you were
-unable to mount devpts, now is the time to try the alternatives. If your kernel
-supports the devfs file system, run the following command to mount
-devfs:</para>
-
-<screen><userinput>mount -t devfs devfs /dev</userinput></screen>
-
-<para>This will mount the devfs file system over the top of the new static
-<filename>/dev</filename> structure. This poses no problems, as the device
-nodes created are still present, they are just hidden by the new devfs file
-system.</para>
-
-<para>If that didn't work either, the only option left is to create a few ptyXX
-and ttyXX device nodes. To do this, open <filename>make_devices</filename> in
-your editor, go to the section "Pseudo-TTY masters" and enable as many ptyXX
-devices as you think you will need (every xterm, ssh connection, telnet
-connection, and the like, uses one of these pseudo terminals). In the
-immediately following section "Pseudo-TTY slaves", enable the corresponding
-ttyXX devices. When you are done, rerun <command>./make_devices</command> from
-inside <filename>/dev</filename> to have it create the new devices.</para>
+unable to mount devpts, you will have to create a few static ptyXX and ttyXX
+device nodes instead. To do this, open <filename>make_devices</filename> in
+your editor, go to the section "Pseudo-TTY masters" and enable a few ptyXX
+devices -- a handful are enough to enable the test suites to run, but if you
+plan to run a kernel without devpts support you will probably need many more
+(every xterm, ssh connection, telnet connection, and the like, uses one of
+these pseudo terminals). In the immediately following section "Pseudo-TTY
+slaves", enable the corresponding ttyXX devices. When you are done, rerun
+<command>./make_devices</command> from inside <filename>/dev</filename> to
+have it create the new devices.</para>
 
 </sect2>
 
diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml
deleted file mode 100644
index 3f63f371f..000000000
--- a/chapter07/introduction.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<sect1 id="ch-scripts-introduction">
-<title>Introduction</title>
-<?dbhtml filename="introduction.html" dir="chapter07"?>
-
-<para>This chapter will set up the bootscripts you installed in the previous
-chapter. Most of these scripts will work without needing to modify them, but a
-few do require additional configuration files, as they deal with hardware
-dependent information.</para>
-
-</sect1>
-