aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Schafer <greg@linuxfromscratch.org>2003-10-13 06:10:04 +0000
committerGreg Schafer <greg@linuxfromscratch.org>2003-10-13 06:10:04 +0000
commita6505d97a1847b029130a6eb207b4324559bb6cd (patch)
treea3d948652135db18879001df89d4c5511f98ce0e
parent05946986d0233d9977107a34eefd1c96ebaffa4b (diff)
Miscellaneous small fixes.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2975 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/conventions.xml2
-rw-r--r--chapter05/chapter05.xml2
-rw-r--r--chapter05/lockingglibc.xml8
3 files changed, 10 insertions, 2 deletions
diff --git a/chapter01/conventions.xml b/chapter01/conventions.xml
index 7f56ad5f0..d453e557a 100644
--- a/chapter01/conventions.xml
+++ b/chapter01/conventions.xml
@@ -17,7 +17,7 @@ referenced.</para></blockquote>
<blockquote><para>This form of text (fixed width text) is showing screen
output, probably as the result of commands issued, and is also used to
-show filenames, such as <filename>/etc/lilo.conf</filename>.</para></blockquote>
+show filenames, such as <filename>/etc/ld.so.conf</filename>.</para></blockquote>
<para><emphasis>Emphasis</emphasis></para>
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 65ef2e07b..fd4d1d65a 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -61,7 +61,7 @@ documentation:</para>
<screen><userinput>rm -rf /tools/{,share/}{doc,info,man}</userinput></screen>
-<para>You will now need to have at least 800 MB of free space on your LFS
+<para>You will now need to have at least 850 MB of free space on your LFS
filesystem to be able to build and install Glibc in the next phase. If you can
build and install Glibc, you can build and install the rest too.</para>
diff --git a/chapter05/lockingglibc.xml b/chapter05/lockingglibc.xml
index 0f62d8f66..bcb0667ec 100644
--- a/chapter05/lockingglibc.xml
+++ b/chapter05/lockingglibc.xml
@@ -16,6 +16,14 @@ the <filename class="directory">binutils-build</filename> directory:</para>
pass of Binutils. From this point onwards everything will link <emphasis>only
</emphasis> against the libraries in <filename>/tools/lib</filename>.</para>
+<note><para>If you somehow missed the earlier warning to retain the Binutils
+source and build directories from the first pass or otherwise accidentally
+deleted them or just don't have access to them, don't worry, all is not lost.
+Just ignore the above command. The result is a small chance of subsequent
+programs linking against libraries on the host. This is not ideal, however,
+it's not a major problem. The situation is corrected when we install the
+second pass of Binutils later on.</para></note>
+
<para>Now that the adjusted linker is installed, you have to remove the
Binutils build and source directories.</para>