diff options
| -rw-r--r-- | chapter01/versions.xml | 11 | ||||
| -rw-r--r-- | chapter04/chapter04.xml | 2 | ||||
| -rw-r--r-- | chapter05/glibc.xml | 8 | ||||
| -rw-r--r-- | chapter06/autoconf.xml | 3 | ||||
| -rw-r--r-- | chapter06/automake.xml | 3 | ||||
| -rw-r--r-- | chapter06/chapter06.xml | 17 | ||||
| -rw-r--r-- | chapter06/ed.xml | 8 | ||||
| -rw-r--r-- | chapter06/makedev.xml | 5 | ||||
| -rw-r--r-- | chapter06/tar.xml | 3 |
9 files changed, 20 insertions, 40 deletions
diff --git a/chapter01/versions.xml b/chapter01/versions.xml deleted file mode 100644 index cf7bcbfe9..000000000 --- a/chapter01/versions.xml +++ /dev/null @@ -1,11 +0,0 @@ -<sect1 id="ch-scatter-version" xreflabel="Chapter 1 - Book Version"> -<title>Book version</title> -<?dbhtml filename="version.html" dir="chapter01"?> - -<para>This is version &version; of the Linux From Scratch book, dated -&releasedate;. If this book is more than three months old, a newer and better -version is probably already available. To find out, check one of the mirrors -listed on <ulink url="&lfs-root;"/>.</para> - -</sect1> - diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml index 61abbdf38..3e6bbd470 100644 --- a/chapter04/chapter04.xml +++ b/chapter04/chapter04.xml @@ -170,7 +170,7 @@ Make (&make-version;) - &make-size;: <ulink url="http://freshmeat.net/projects/gnumake"/> Make_devices (&makedev-version;) - &makedev-size;: -<ulink url="&http-down;~alex/Make_devices-&makedev-version;.bz2"/> +<ulink url="&lfs-root;~alex/make_devices-&makedev-version;.bz2"/> Man (&man-version;) - &man-size;: <ulink url="http://freshmeat.net/projects/man/"/> diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 1340cc9c0..4e8ab7b66 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -58,10 +58,10 @@ strangely enough insists on linking against the host's libraries (libgd, libpng, libz, and so forth).</para></listitem> <listitem><para><userinput>--without-cvs</userinput>: This is meant to prevent -the Makefiles from attempting automatic CVS commits when using a CVS snapshot. -But it's not actually needed these days. We use it because it silences an -annoying but harmless warning about a missing <filename>autoconf</filename> -program.</para></listitem> +the Makefiles from attempting automatic CVS checkouts when using a CVS +snapshot. But it's not actually needed these days. We use it because it +suppresses an annoying but harmless warning about a missing +<command>autoconf</command> program.</para></listitem> </itemizedlist> <para>During this stage you might see the following warning:</para> diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml index 08e8ea51e..7401d1ab3 100644 --- a/chapter06/autoconf.xml +++ b/chapter06/autoconf.xml @@ -24,8 +24,7 @@ can automatically configure source code.</para> <screen><userinput>make</userinput></screen> <para>To have the results tested, issue: -<userinput>make check</userinput>.This takes a long time, about 2 SBUs, -and is strictly optional.</para> +<userinput>make check</userinput>. This takes a long time, about 2 SBUs.</para> <para>And install the package:</para> diff --git a/chapter06/automake.xml b/chapter06/automake.xml index d023313e0..05fd9fe3a 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -25,8 +25,7 @@ with Autoconf.</para> <screen><userinput>make</userinput></screen> <para>To have the results tested, issue: -<userinput>make check</userinput>. This takes a long time, about 4 SBUs, -and is strictly optional.</para> +<userinput>make check</userinput>. This takes a long time, about 5 SBUs.</para> <para>Install the package:</para> diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index a9ddc2a71..e008d7cd5 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -255,16 +255,17 @@ dialout:x:10: audio:x:11: <userinput>EOF</userinput></screen> -<para>The created groups aren't part of any standard -- they are the groups -that the MAKEDEV script in the next section uses. Besides the group "root", the -LSB (<ulink url="http://www.linuxbase.org"/>) recommends only a group "bin", -with a GID of 1, be present. All other group names and GIDs can be chosen -freely by the user, as well-written packages don't depend on GID numbers but -use the group's name.</para> +<para>The created groups aren't part of any standard -- they are some of the +groups that the <command>make_devices</command> script in the next section +uses. The LSB (<ulink url="http://www.linuxbase.org">Linux Standard +Base</ulink>) recommends only that, beside the group "root" with a GID of 0, a +group "bin" with a GID of 1 be present. All other group names and GIDs can +be chosen freely by the system administrator, since well-written packages don't +depend on GID numbers but use the group's name.</para> <para>To get rid of the "I have no name!" prompt, we will start a new shell. -Since we installed a full Glibc in <xref linkend="chapter-temporary-tools"/>, and have just -created the <filename>/etc/passwd</filename> and +Since we installed a full Glibc in <xref linkend="chapter-temporary-tools"/>, +and have just created the <filename>/etc/passwd</filename> and <filename>/etc/group</filename> files, user name and group name resolution will now work.</para> diff --git a/chapter06/ed.xml b/chapter06/ed.xml index e3e14ca15..a5e9d3942 100644 --- a/chapter06/ed.xml +++ b/chapter06/ed.xml @@ -23,11 +23,9 @@ days.</para></note> <para>Ed normally uses the <emphasis>mktemp</emphasis> function to create temporary files in <filename class="directory">/tmp</filename>, but this function contains a vulnerability (see the section on Temporary Files in <ulink -url="http://en.tldp.org/HOWTO/Secure-Programs-HOWTO/avoid-race.html"/>). The -following patch makes Ed use <emphasis>mkstemp</emphasis> instead, which is -the recommended way to create temporary files.</para> - -<para>Apply the patch:</para> +url="http://en.tldp.org/HOWTO/Secure-Programs-HOWTO/avoid-race.html"/>). Apply +the following patch to make Ed use <emphasis>mkstemp</emphasis> instead, a +secure way to create temporary files:</para> <screen><userinput>patch -Np1 -i ../&ed-patch;</userinput></screen> diff --git a/chapter06/makedev.xml b/chapter06/makedev.xml index 3fce5fb6a..59be742ce 100644 --- a/chapter06/makedev.xml +++ b/chapter06/makedev.xml @@ -63,11 +63,6 @@ you are satisfied, run the script to create the device files:</para> <screen><userinput>cd /dev ./make_devices</userinput></screen> -<para>(The FHS states that there should be a <filename>MAKEDEV</filename> -script present in the <filename class="directory">/dev</filename> directory. -But the FHS is mistaken: it should not dictate anything about files, and limit -itself to directories.)</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 diff --git a/chapter06/tar.xml b/chapter06/tar.xml index 78f9e3a22..3c96fe1fe 100644 --- a/chapter06/tar.xml +++ b/chapter06/tar.xml @@ -17,8 +17,7 @@ <para>Prepare Tar for compilation:</para> -<screen><userinput>./configure --prefix=/usr --bindir=/bin \ - --libexecdir=/usr/sbin</userinput></screen> +<screen><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen> <para>Compile the package:</para> |