aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorAlex Gronenwoud <alex@linuxfromscratch.org>2004-02-28 11:26:41 +0000
committerAlex Gronenwoud <alex@linuxfromscratch.org>2004-02-28 11:26:41 +0000
commitdb9d773c6e39372c09613573d66473172d4f353f (patch)
tree91b594ceb3f92f088471701b492277c2a914344b /chapter06
parent687ef736a582e6672791398a62af027c5bac82ec (diff)
Forgetfulness makes the most traffic...
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3271 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/chapter06.xml11
-rw-r--r--chapter06/ncurses.xml5
-rw-r--r--chapter06/vim.xml6
-rw-r--r--chapter06/zlib.xml17
4 files changed, 19 insertions, 20 deletions
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 0df77c71e..6bb1b5bf4 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -573,10 +573,13 @@ the current situation.</para>
<para>If you are going to perform the stripping, special care is needed to
ensure you're not running any of the binaries that are about to be stripped.
If you're not sure whether you entered chroot with the command given in
-<xref linkend="ch-system-chroot"/>, then now exit from chroot and reenter it
-with the following commands:</para>
+<xref linkend="ch-system-chroot"/>, then first exit from chroot:</para>
-<screen><userinput>logout; chroot $LFS /tools/bin/env -i \
+<screen><userinput>logout</userinput></screen>
+
+<para>Then reenter it with:</para>
+
+<screen><userinput>chroot $LFS /tools/bin/env -i \
&nbsp;&nbsp;&nbsp;&nbsp;HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
&nbsp;&nbsp;&nbsp;&nbsp;PATH=/bin:/usr/bin:/sbin:/usr/sbin \
&nbsp;&nbsp;&nbsp;&nbsp;/tools/bin/bash --login</userinput></screen>
@@ -616,7 +619,7 @@ class="directory">/tools</filename> are no longer needed, you may want to
delete the whole directory and regain the space. Before actually deleting the
directory, exit from chroot and reenter it with the above command. Also, before
removing <filename class="directory">/tools</filename>, you may want to tar it
-up and store it in a safe place, in case you want build another LFS system
+up and store it in a safe place, in case you want to build another LFS system
soon.</para>
<note><para>Removing <filename class="directory">/tools</filename> will also
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 82a9c23ba..700d81b9e 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -41,9 +41,8 @@ where they're expected to reside:</para>
<screen><userinput>mv /usr/lib/libncurses.so.5* /lib</userinput></screen>
-<para>Since the libraries have been moved to
-<filename>/lib</filename>, a few symlinks are currently pointing
-towards non-existing files. Recreate those symlinks:</para>
+<para>Now the libraries have been moved, a few symlinks are pointing to
+non-existent files. Recreate those symlinks:</para>
<screen><userinput>ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
ln -sf libncurses.so /usr/lib/libcurses.so</userinput></screen>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index fd23e5ef3..272b1f4cf 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -25,7 +25,7 @@ suggested installation instructions.</para>
<title>Installation of Vim</title>
<para>First change the default locations of the <filename>vimrc</filename> and
-<filename>gvimrc</filename> files to <filename
+<filename>gvimrc</filename> configuration files to <filename
class="directory">/etc</filename>.</para>
<screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h
@@ -42,8 +42,8 @@ echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h</userinput><
<para>To have the results tested, you can issue:
<userinput>make check</userinput>. However, this test suite outputs a lot of
seemingly garbage characters to the screen, and this can wreak havoc with the
-settings of the current terminal. Accordingly, the running of the test suite
-here is strictly optional.</para>
+settings of the current terminal. Therefore the running of the test suite here
+is strictly optional.</para>
<para>And install the package:</para>
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 23a4efb9e..798f3cb1f 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -33,8 +33,6 @@ afterwards.</para></note>
<para>To have the results tested, issue:
<userinput>make check</userinput>.</para>
-<screen><userinput>make check</userinput></screen>
-
<para>Install the shared library:</para>
<screen><userinput>make install</userinput></screen>
@@ -44,7 +42,7 @@ afterwards.</para></note>
./configure --prefix=/usr
make</userinput></screen>
-<para>To have the results tested, issue:
+<para>To have the results tested again, issue:
<userinput>make check</userinput>.</para>
<para>Install the static library:</para>
@@ -58,21 +56,20 @@ make</userinput></screen>
<para>It is good policy and common practice to place important libraries into
the <filename class="directory">/lib</filename> directory. This matters most
in scenarios where <filename class="directory">/usr</filename> is on a
-separate partition. Essentially, the run-time components of any libraries
-depended upon by programs in <filename class="directory">/bin</filename> or
+separate partition. Essentially, the run-time components of any libraries that
+are used by programs in <filename class="directory">/bin</filename> or
<filename class="directory">/sbin</filename> should reside in
<filename class="directory">/lib</filename> so that they are on the root
partition and available in the event of
<filename class="directory">/usr</filename> being inaccessible.</para>
-<para>Therefore we move the run-time components of the shared Zlib into
-<filename class="directory">/lib</filename> by issuing the following
-command:</para>
+<para>For the above reason we move the run-time components of the shared Zlib
+into <filename class="directory">/lib</filename>:</para>
<screen><userinput>mv /usr/lib/libz.so.* /lib</userinput></screen>
-<para>Now we need to fix up the <filename>/usr/lib/libz.so</filename> symlink
-because we just moved the location of the file it points to:</para>
+<para>Now we need to fix the <filename>/usr/lib/libz.so</filename> symlink
+because we just moved the file it points to:</para>
<screen><userinput>ln -sf ../../lib/libz.so.1 /usr/lib/libz.so</userinput></screen>