aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorAlex Gronenwoud <alex@linuxfromscratch.org>2003-08-29 23:20:53 +0000
committerAlex Gronenwoud <alex@linuxfromscratch.org>2003-08-29 23:20:53 +0000
commit5e49531c2381fa865fbf026812be54781da9e1d3 (patch)
tree1cf0588e97f200d9df6f10fab4b07d31294c71f9 /chapter06
parent89fcc345410a3b858b6c23ba219e828bc21e4de4 (diff)
Adding some missing markup, and changing remaining /static's to /stage1's.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2696 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/bootscripts-inst.xml8
-rw-r--r--chapter06/gcc-2953-inst.xml4
-rw-r--r--chapter06/introduction.xml4
-rw-r--r--chapter06/man-inst.xml2
-rw-r--r--chapter06/revisedchroot.xml4
5 files changed, 11 insertions, 11 deletions
diff --git a/chapter06/bootscripts-inst.xml b/chapter06/bootscripts-inst.xml
index f4ebbc6da..50d709d54 100644
--- a/chapter06/bootscripts-inst.xml
+++ b/chapter06/bootscripts-inst.xml
@@ -4,10 +4,10 @@
<title>Installation of LFS-Bootscripts</title>
<para>We will be using SysV style init scripts. We have chosen this style
-because it is widely used and we feel comfortable with it. If you would
-prefer to try something else, Marc Heerdink has written a hint about BSD
-style init scripts, which may be found at
-<ulink url="&hints-root;bsd-init.txt"/>.</para>
+because it is widely used and we feel comfortable with it. If you would prefer
+to try something else, Marc Heerdink has written a hint about BSD style init
+scripts, to be found at <ulink url="&hints-root;bsd-init.txt"/>. And if you'd
+like something more radical, search the LFS mailing lists for depinit.</para>
<para>If you decide to use BSD style, or some other style scripts, you can
skip Chapter 7 when you arrive at it and move on to Chapter 8.</para>
diff --git a/chapter06/gcc-2953-inst.xml b/chapter06/gcc-2953-inst.xml
index 9d2cc633a..9d4bd5d17 100644
--- a/chapter06/gcc-2953-inst.xml
+++ b/chapter06/gcc-2953-inst.xml
@@ -19,8 +19,8 @@ cd ../gcc-2-build
make bootstrap
make install</userinput></screen></para>
-<para>Add the lib directory to ld.so.conf so they can be found during
-run-time:</para>
+<para>Add the compiler's library directory to <filename>ld.so.conf</filename>,
+so these libraries can be found at run time:</para>
<para><screen><userinput>echo "/opt/gcc-2.95.3/lib" >> /etc/ld.so.conf
ldconfig</userinput></screen></para>
diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml
index 68456fc4e..421c6eb8d 100644
--- a/chapter06/introduction.xml
+++ b/chapter06/introduction.xml
@@ -25,11 +25,11 @@ optimization and see if the problem goes away.</para>
<para>The order in which packages are installed in this chapter has
to be strictly followed, to ensure that no program gets a path referring
-to <filename class="directory">/static</filename> hard-wired into it.
+to <filename class="directory">/stage1</filename> hard-wired into it.
For the same reason, <emphasis>do not </emphasis> compile packages
in parallel. Compiling in parallel may save you some time (especially on
dual-CPU machines), but it could result in a program containing a
-hard-wired path to <filename class="directory">/static</filename>,
+hard-wired path to <filename class="directory">/stage1</filename>,
which will cause the program to stop working when the static directory
is removed.</para>
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
index 5e46f0c0e..075318032 100644
--- a/chapter06/man-inst.xml
+++ b/chapter06/man-inst.xml
@@ -27,7 +27,7 @@ Unfortunately, the configure script picks the last location in PATH
rather than the first place a program is found. By appending
<emphasis>/usr/bin:/bin</emphasis> to PATH for the
<userinput>./configure</userinput> command, we ensure that man doesn't
-use the programs in the <filename class="directory">/static</filename>
+use the programs in the <filename class="directory">/stage1</filename>
directory.</para>
<para>Now prepare Man for compilation:</para>
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index 4450807d8..09899428c 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -6,13 +6,13 @@
it, you need to run the following modified chroot command. The one at the
beginning of this chapter might not work anymore (if your host distribution
was based on glibc-2.2.x or older, the programs in <filename
-class="directory">/static/bin</filename>, such as <filename>bash</filename>,
+class="directory">/stage1/bin</filename>, such as <filename>bash</filename>,
will not work anymore). The following chroot command will work regardless
of your host distribution's Glibc version.</para>
<para>Additionally, now that all software has been installed there is no
need to use anything from the <filename
-class="directory">/static</filename> directory anymore.</para>
+class="directory">/stage1</filename> directory anymore.</para>
<para><screen><userinput>chroot $LFS /usr/bin/env -i \
&nbsp;&nbsp;&nbsp;&nbsp;HOME=/root TERM=$TERM PS1='\u:\w\$ ' \