aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2001-08-29 16:56:32 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2001-08-29 16:56:32 +0000
commitfada43129e4a962c678a0b17a8278da367cd9775 (patch)
tree8c319f69e217ad8c48c6d4660ae8cbf82dcf767a
parentbc831b5f5f350ca8ce189dc5126912638c04e8ff (diff)
text updates
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1105 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/how.xml17
-rw-r--r--chapter01/versions.xml7
-rw-r--r--chapter02/aboutlfs.xml8
-rw-r--r--chapter02/bootscripts.xml2
-rw-r--r--chapter02/commands.xml19
-rw-r--r--chapter02/download.xml21
-rw-r--r--chapter02/install.xml23
7 files changed, 51 insertions, 46 deletions
diff --git a/chapter01/how.xml b/chapter01/how.xml
index 0b02798c1..3ecbe4c3f 100644
--- a/chapter01/how.xml
+++ b/chapter01/how.xml
@@ -14,20 +14,25 @@ will be installed onto.</para>
<para>The next step, chapter 5, will be the installation of a number of
packages that are statically linked and installed on the LFS partition.
These packages form a basic development suite which will be used to
-install the actual system.</para>
+install the actual system, and are also needed to resolve circular
+dependencies. Examples of circular dependencies are: you need a compiler
+to install a compiler. You need a shell in order to install a shell. And
+so on.</para>
-<para>Chapter 6 installs the actual base system. We use the chroot program to
-start a new shell who's root directory will be set to the LFS
+<para>Chapter 6 installs the actual base system. We use the chroot program
+to start a new shell whose root directory will be set to the LFS
partition. This, in essence, is the same as rebooting and have the
kernel mount the LFS partition as the root partition. The reason that
we don't actually reboot, but instead chroot, is that this way you can
still use your host system. While software is being installed you can
simply switch to a different VC (Virtual Console) or X desktop and
-continue using your computer.</para>
+continue using your computer as you normally would.</para>
<para>When all the software is installed, chapter 7 will setup the boot
-scripts. Chapter 8 will setup the Linux boot loader and you can finally
-reboot your system into your new LFS-system.</para>
+scripts. Chapter 8 will setup the Linux boot loader and in chapter 9
+there are some pointers what you can do after you finish the book. Then
+you can finally reboot your system into your new LFS system, and start
+to really use it.</para>
<para>This is the process in a nutshell. Detailed information on the steps
you are taking are provided in the chapters as you go through them. If
diff --git a/chapter01/versions.xml b/chapter01/versions.xml
index 22359c9fc..77ad26c22 100644
--- a/chapter01/versions.xml
+++ b/chapter01/versions.xml
@@ -2,11 +2,12 @@
<title>Book version</title>
<para>This is LFS-BOOK version &version; dated &releasedate;. If this
-version is older than a month a newer version might be available for download
-at the LFS homepage.</para>
+version is older than a month a newer version is probably already available
+for download. Check one of the mirror sites below for updated
+versions.</para>
<para>Below is a list of our current HTTP and FTP mirror sites as
-of August 27th, 2001. This list might not be accurate anymore.
+of August 29th, 2001. This list might not be accurate anymore.
The latest info can be found on our website at
<ulink url="http://www.linuxfromscratch.org">http://www.linuxfromscratch.org</ulink>.</para>
diff --git a/chapter02/aboutlfs.xml b/chapter02/aboutlfs.xml
index 8533f7382..2ff9da689 100644
--- a/chapter02/aboutlfs.xml
+++ b/chapter02/aboutlfs.xml
@@ -3,10 +3,10 @@
<para>Please read the following carefully: throughout this book
the variable $LFS will be used frequently. $LFS must at all times be
-replaced by the directory where the partition that contains the LFS system
+replaced with the directory where the partition that contains the LFS system
is mounted. How to create and where to mount the partition will be
-explained in full detail in chapter 4. In my case, the LFS
-partition is mounted on /mnt/lfs.</para>
+explained in full detail in chapter 4. For example, let's assume that
+the LFS partition is mounted on /mnt/lfs.</para>
<para>For example when you are told to run a command like
<userinput>./configure --prefix=$LFS</userinput> you actually have to
@@ -16,7 +16,7 @@ execute <userinput>./configure --prefix=/mnt/lfs</userinput></para>
commands entered in a shell, or in a file edited or created.</para>
<para>A possible solution is to set the environment variable LFS.
-This way $LFS can be entered literally instead of replacing it by
+This way $LFS can be entered literally instead of replacing it with
/mnt/lfs. This is accomplished by running <userinput>export
LFS=/mnt/lfs</userinput>.</para>
diff --git a/chapter02/bootscripts.xml b/chapter02/bootscripts.xml
index 96cd852c6..5caa5014d 100644
--- a/chapter02/bootscripts.xml
+++ b/chapter02/bootscripts.xml
@@ -1,7 +1,7 @@
<sect1 id="ch02-bootscripts">
<title>Download the bootscripts</title>
-<para>Typing out all the bootscripts in chapters 7 and 9 can be a long, tedious
+<para>Typing out all the bootscripts in chapter 7can be a long, tedious
process, not to mention very error-prone.</para>
<para>To save some time, the bootscripts can be downloaded from <ulink
diff --git a/chapter02/commands.xml b/chapter02/commands.xml
index 566fde592..4cbb0f4af 100644
--- a/chapter02/commands.xml
+++ b/chapter02/commands.xml
@@ -5,7 +5,7 @@
commands for the packages installed in this book.</para>
<para>These files can be used to quickly find out which commands have
-been changed between the different LFS versions as well. Download the
+been changed between the different LFS versions. Download the
lfs-commands tarball for this book version and the previous book
version and run a diff on the files. That way it is possible to see which
packages have updated installation instructions, so any scripts you may
@@ -13,13 +13,16 @@ have can be modified, or you can reinstall a package if you think that
necessary.</para>
<para>A side effect is that these files can be used to dump to a shell and
-install the packages, though some files need to be modified (for
-example, when the kbd package is installed, you needed to select the
-keyboard layout file, because it can't reliably be guessed). Keep in
-mind, please, that these files are not checked for correctness,
-integrity and so forth. There may be bugs in the files (since they are
-manually created, typo's are often inevitable) so do check them and
-don't blindly trust them.</para>
+install the packages, though some files need to be modified (where
+certain settings can't be guessed and depend on user preference or
+system hardware). Keep in mind, please, that these files are not
+thoroughly checked for correctness. There may be bugs in the files (since
+they are manually created at the moment) so do check them and don't
+blindly trust them.</para>
+
+<para>If you decide to use the commands to automatically install a
+package and it doesn't work, try reading the book's instructions
+instead before you ask for help on the mailinglist.</para>
<para>The lfscommands can be downloaded from <ulink
url="&http-root;/lfs-commands/">&http-root;/lfs-commands/</ulink>
diff --git a/chapter02/download.xml b/chapter02/download.xml
index b8e76fa41..117ae4d4e 100644
--- a/chapter02/download.xml
+++ b/chapter02/download.xml
@@ -1,25 +1,20 @@
<sect1 id="ch02-download">
<title>How to download the software</title>
-<para>Throughout this document, I will assume that all the
+<para>Throughout this document, we will assume that all the
packages that were downloaded are placed somewhere in $LFS/usr/src.</para>
-<para>I use the convention of having a $LFS/usr/src/sources directory.
-Under sources, I have the directory 0-9 and the directories a
+<para>A convention you could use is having a $LFS/usr/src/sources directory.
+Under sources, you can create the directory 0-9 and the directories a
through z. A package like sysvinit-&sysvinit-version;.tar.bz2 is stored under
$LFS/usr/src/sources/s/. A package like bash-&bash-version;.tar.bz2 is stored
-under $LFS/usr/src/sources/b/, and so forth. This convention does not have to
-be followed, of course; I was just giving an example. It's better to keep
-the packages out of $LFS/usr/src and move them to a subdirectory, so
-we'll have a clean $LFS/usr/src directory in which we will unpack the
-packages and work with them.</para>
+under $LFS/usr/src/sources/b/, and so forth.</para>
<para>The next chapter contains the list of all the packages that need to be
-downloaded,
-but the partition that is going to contain our LFS system isn't created yet.
-Therefore, the files are temporarily stored somewhere else (it's up to
-you to decide where this 'else' is) and later moved to $LFS/usr/src/ when
-the chapter in which the new partition is prepared has been finished.</para>
+downloaded, but the partition that is going to contain our LFS system isn't
+created yet. Therefore, you should store the files somewhere else and later
+moved to $LFS/usr/src/ when the chapter in which the new partition is
+prepared has been finished.</para>
</sect1>
diff --git a/chapter02/install.xml b/chapter02/install.xml
index ca6374a92..aa2856abf 100644
--- a/chapter02/install.xml
+++ b/chapter02/install.xml
@@ -8,8 +8,8 @@ simple life, use bash.</para>
<para>Before you can actually start doing something with a package, you need
to unpack it first. Often the package files are tar'ed and
-gzip'ed or bzip2'ed. I'm not going to write down every time how to
-unpack an archive. I will explain how to do that once, in this
+gzip'ed or bzip2'ed. We're not going to write down every time how to
+unpack an archive. We'll explain how to do that once, in this
section.</para>
<para>To start with, change to the $LFS/usr/src directory by running:</para>
@@ -58,15 +58,16 @@ can be used they need to be uncompressed first.</para>
<para><screen><userinput>bunzip2 filename.bz2</userinput></screen></para>
-<para>After a package has been installed, two things can be done with it:
-either the directory that contains the sources can be deleted,
-or it can be kept. If it is kept, that's fine with me, but if the
-same package is needed again in a later chapter, the directory
-needs to be deleted first before using it again. If this is not done,
-you might end up in trouble because old settings will be used (settings
-that apply to the host system but which don't always apply to
-the LFS system). Doing a simple make clean or make distclean does not
-always guarantee a totally clean source tree.</para>
+<para>After a package has been installed, two things can be done with
+it: either the directory that contains the sources can be deleted, or it
+can be kept. We highly recommend deleting it. If you don't do this and
+try to re-use the same source later on in the book (for example re-using
+the source trees from chapter 5 for use in chapter 6), it may not work
+as you expect it to. Source trees from chapter 5 will have your host
+distribution's settings, which don't always apply to the LFS system
+after you enter the chroot'ed environment. Even running something like
+<emphasis>make clean</emphasis> doesn't always guarantee a clean source
+tree.</para>
<para>So, save yourself a lot of hassle and just remove the source directory
immediately after you have installed it.</para>