aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chapter05/gcc-pass1.xml16
-rw-r--r--chapter05/generalinstructions.xml2
-rw-r--r--chapter06/adjusting.xml2
-rw-r--r--chapter06/bc.xml4
-rw-r--r--chapter06/dbus.xml24
-rw-r--r--chapter06/expat.xml4
-rw-r--r--chapter06/gcc.xml3
-rw-r--r--chapter06/glibc.xml13
-rw-r--r--chapter06/introduction.xml8
-rw-r--r--chapter06/libcap.xml21
-rw-r--r--chapter06/m4.xml2
-rw-r--r--chapter06/perl.xml2
-rw-r--r--chapter06/pkgconfig.xml2
-rw-r--r--chapter06/procps.xml4
-rw-r--r--chapter06/readline.xml4
-rw-r--r--chapter06/shadow.xml4
-rw-r--r--chapter06/systemd.xml31
-rw-r--r--chapter06/util-linux.xml2
-rw-r--r--chapter06/vim.xml11
-rw-r--r--chapter07/clock.xml4
-rw-r--r--chapter07/consoled.xml6
-rw-r--r--chapter07/inputrc.xml2
-rw-r--r--chapter07/locale.xml10
-rw-r--r--chapter07/systemd-custom.xml28
-rw-r--r--chapter07/udev.xml13
-rw-r--r--chapter08/kernel.xml18
-rw-r--r--general.ent6
-rw-r--r--prologue/architecture.xml11
-rw-r--r--prologue/audience.xml2
29 files changed, 134 insertions, 125 deletions
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index aa3632481..e4c888294 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -84,7 +84,7 @@ done</userinput></screen>
<para>In case the above seems hard to follow, let's break it down a bit.
First we copy the files <filename>gcc/config/linux.h</filename>,
<filename>gcc/config/i386/linux.h</filename>, and
- <filename>gcc/config/i368/linux64.h</filename>. to a file of
+ <filename>gcc/config/i368/linux64.h</filename> to a file of
the same name but with an added suffix of <quote>.orig</quote>. Then the
first sed expression prepends <quote>/tools</quote> to every instance of
<quote>/lib/ld</quote>, <quote>/lib64/ld</quote> or
@@ -185,12 +185,14 @@ cd build</userinput></screen>
<varlistentry>
<term><parameter>--with-native-system-header-dir=/tools/include</parameter></term>
<listitem>
- <para>By default GCC searches <filename>/usr/include</filename> for system
- headers. In conjunction with the sysroot switch, this would translate normally
- to <filename>$LFS/usr/include</filename>. However the headers that will be installed
- in the next two sections will go to <filename>$LFS/tools/include</filename>. This
- switch ensures that gcc will find them correctly. In the second pass of GCC, this
- same switch will ensure that no headers from the host system are found.</para>
+ <para>By default GCC searches <filename>/usr/include</filename> for
+ system headers. In conjunction with the sysroot switch, this would
+ normally translate to <filename>$LFS/usr/include</filename>. However
+ the headers that will be installed in the next two sections will go
+ to <filename>$LFS/tools/include</filename>. This switch ensures that
+ gcc will find them correctly. In the second pass of GCC, this same
+ switch will ensure that no headers from the host system are
+ found.</para>
</listitem>
</varlistentry>
diff --git a/chapter05/generalinstructions.xml b/chapter05/generalinstructions.xml
index d2f5d61af..0f14246cf 100644
--- a/chapter05/generalinstructions.xml
+++ b/chapter05/generalinstructions.xml
@@ -48,7 +48,7 @@
<listitem>
- <para>Finally, two last important items must be emphasized:</para>
+ <para>Finally, two important items must be emphasized:</para>
<important>
diff --git a/chapter06/adjusting.xml b/chapter06/adjusting.xml
index 1231c2ca8..5852d2958 100644
--- a/chapter06/adjusting.xml
+++ b/chapter06/adjusting.xml
@@ -110,7 +110,7 @@ SEARCH_DIR("/lib")</computeroutput></screen>
at all, then something is seriously wrong. Investigate and retrace the
steps to find out where the problem is and correct it. The most likely
reason is that something went wrong with the specs file adjustment. Any
- issues will need to be resolved before continuing on with the process.</para>
+ issues will need to be resolved before continuing with the process.</para>
<para os="u">Once everything is working correctly, clean up the test files:</para>
diff --git a/chapter06/bc.xml b/chapter06/bc.xml
index 2b168fbc0..e538c0466 100644
--- a/chapter06/bc.xml
+++ b/chapter06/bc.xml
@@ -128,7 +128,7 @@ ln -sfv libncurses.so.6 /usr/lib/libncurses.so</userinput></screen>
<varlistentry id="bc">
<term><command>bc</command></term>
<listitem>
- <para>is a command line calculator</para>
+ <para>A command line calculator</para>
<indexterm zone="ch-system-bc bc">
<primary sortas="b-bc">bc</primary>
</indexterm>
@@ -138,7 +138,7 @@ ln -sfv libncurses.so.6 /usr/lib/libncurses.so</userinput></screen>
<varlistentry id="dc">
<term><command>dc</command></term>
<listitem>
- <para>is a reverse-polish command line calculator</para>
+ <para>A reverse-polish command line calculator</para>
<indexterm zone="ch-system-bc dc">
<primary sortas="b-dc">dc</primary>
</indexterm>
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index 8b7b6a582..06b66851e 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -125,7 +125,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
<varlistentry id="dbus-cleanup-sockets">
<term><command>dbus-cleanup-sockets</command></term>
<listitem>
- <para>is used to clean up leftover sockets in a directory</para>
+ <para>Used to clean up leftover sockets in a directory</para>
<indexterm zone="ch-system-dbus dbus-cleanup-sockets">
<primary sortas="b-dbus-cleanup-sockets">dbus-cleanup-sockets</primary>
</indexterm>
@@ -135,7 +135,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
<varlistentry id="dbus-daemon">
<term><command>dbus-daemon</command></term>
<listitem>
- <para>is the D-Bus message bus daemon</para>
+ <para>The D-Bus message bus daemon</para>
<indexterm zone="ch-system-dbus dbus-daemon">
<primary sortas="b-dbus-daemon">dbus-daemon</primary>
</indexterm>
@@ -145,7 +145,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
<varlistentry id="dbus-launch">
<term><command>dbus-launch</command></term>
<listitem>
- <para>starts <command>dbus-daemon</command> from a shell
+ <para>Starts <command>dbus-daemon</command> from a shell
script</para>
<indexterm zone="ch-system-dbus dbus-launch">
<primary sortas="b-dbus-launch">dbus-launch</primary>
@@ -156,7 +156,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
<varlistentry id="dbus-monitor">
<term><command>dbus-monitor</command></term>
<listitem>
- <para>monitors messages passing through a D-Bus message bus</para>
+ <para>Monitors messages passing through a D-Bus message bus</para>
<indexterm zone="ch-system-dbus dbus-monitor">
<primary sortas="b-dbus-monitor">dbus-monitor</primary>
</indexterm>
@@ -166,7 +166,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
<varlistentry id="dbus-run-session">
<term><command>dbus-run-session</command></term>
<listitem>
- <para>starts a session bus instance of <command>dbus-daemon</command>
+ <para>Starts a session bus instance of <command>dbus-daemon</command>
from a shell script and starts a specified program in that
session</para>
<indexterm zone="ch-system-dbus dbus-run-session">
@@ -178,7 +178,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
<varlistentry id="dbus-send">
<term><command>dbus-send</command></term>
<listitem>
- <para>sends a message to a D-Bus message bus</para>
+ <para>Sends a message to a D-Bus message bus</para>
<indexterm zone="ch-system-dbus dbus-send">
<primary sortas="b-dbus-send">dbus-send</primary>
</indexterm>
@@ -188,8 +188,8 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
<varlistentry id="dbus-test-tool">
<term><command>dbus-test-tool</command></term>
<listitem>
- <para>is a tool to help packages test
- <application>D-Bus</application>.</para>
+ <para>A tool to help packages test
+ <application>D-Bus</application></para>
<indexterm zone="ch-system-dbus dbus-test-tool">
<primary sortas="b-dbus-test-tool">dbus-test-tool</primary>
</indexterm>
@@ -200,8 +200,8 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
<varlistentry id="dbus-update-activation-environment">
<term><command>dbus-update-activation-environment</command></term>
<listitem>
- <para>updates environment variables that will be set for
- <application>D-Bus</application> session services.</para>
+ <para>Updates environment variables that will be set for
+ <application>D-Bus</application> session services</para>
<indexterm zone="ch-system-dbus dbus-update-activation-environment">
<primary sortas="b-dbus-update-activation-environment">dbus-update-activation-environment</primary>
</indexterm>
@@ -211,7 +211,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
<varlistentry id="dbus-uuidgen">
<term><command>dbus-uuidgen</command></term>
<listitem>
- <para>generates a universally unique ID</para>
+ <para>Generates a universally unique ID</para>
<indexterm zone="ch-system-dbus dbus-uuidgen">
<primary sortas="b-dbus-uuidgen">dbus-uuidgen</primary>
</indexterm>
@@ -221,7 +221,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
<varlistentry id="libdbus-1">
<term><filename class="libraryfile">libdbus-1</filename></term>
<listitem>
- <para>contains API functions used to communicate with the D-Bus
+ <para>Contains API functions used to communicate with the D-Bus
message bus</para>
<indexterm zone="ch-system-dbus libdbus-1">
<primary sortas="c-libdbus-1">libdbus-1</primary>
diff --git a/chapter06/expat.xml b/chapter06/expat.xml
index c11a9e28f..7b71c8481 100644
--- a/chapter06/expat.xml
+++ b/chapter06/expat.xml
@@ -91,7 +91,7 @@ install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</user
<varlistentry id="xmlwf">
<term><command>xmlwf </command></term>
<listitem>
- <para>is a non-validating utility to check whether or not
+ <para>Is a non-validating utility to check whether or not
XML documents are well formed</para>
<indexterm zone="ch-system-expat xmlwf">
<primary sortas="b-xmlwf">xmlwf</primary>
@@ -102,7 +102,7 @@ install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</user
<varlistentry id="libexpat">
<term><filename class="libraryfile">libexpat</filename></term>
<listitem>
- <para> contains API functions for parsing XML</para>
+ <para>Contains API functions for parsing XML</para>
<indexterm zone="ch-system-expat libexpat">
<primary sortas="c-libexpat">libexpat</primary>
</indexterm>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 289885a72..f54ed6c75 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -219,10 +219,13 @@ ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/&gcc-version;/liblto_plugin.so \
<para>Again, note that the directory named after your target triplet may be
different than the above, depending on your architecture.</para>
+<!-- This appears to be obsolete
+
<note><para>As of version 4.3.0, GCC now unconditionally installs the
<filename>limits.h</filename> file into the private
<filename class="directory">include-fixed</filename> directory, and that
directory is required to be in place.</para></note>
+-->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="adjusting.xml"
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 8a40aee02..07cbe969d 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -50,7 +50,7 @@
Glibc autoconf tests would give false results and defeat the goal
of achieving a clean build.</para></note>
- <para>Some of the Glibc programs use non-FHS compilant
+ <para>Some of the Glibc programs use the non-FHS compilant
<filename class="directory">/var/db</filename> directory to store
their runtime data. Apply the following patch to make such programs
store their runtime data in the FHS-compliant locations:</para>
@@ -123,10 +123,9 @@ unset GCC_INCDIR</userinput></screen>
<varlistentry>
<term><parameter>--enable-stack-protector=strong</parameter></term>
<listitem>
- <para>This option increases system security by adding a known canary
- (a random integer) to the stack during a function preamble, and checks
- it when the function returns. If it changed, there was a stack
- overflow, and the program aborts.</para>
+ <para>This option increases system security by adding
+ extra code to check for buffer overflows, such as stack
+ smashing attacks.</para>
</listitem>
</varlistentry>
@@ -149,8 +148,8 @@ unset GCC_INCDIR</userinput></screen>
Do not skip it under any circumstance.</para>
</important>
- <para>Generally a few tests do not pass, but you can generally ignore
- any of the test failures listed below. Now test the build results:</para>
+ <para>Generally a few tests do not pass. The test failures listed below
+ are usually safe to ignore.</para>
<screen><userinput remap="test">make check</userinput></screen>
diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml
index 4671662c6..fd96b574a 100644
--- a/chapter06/introduction.xml
+++ b/chapter06/introduction.xml
@@ -68,11 +68,11 @@
do the linking) may not even be known.</para>
<para>In the procedures in Chapter 6, we remove or disable installation of
- most static libraries. In a few cases, especially glibc and gcc, the use
- of static libraries remains essential to the general package building
- process. Usually this is done by passing a
+ most static libraries. Usually this is done by passing a
<option>--disable-static</option> option to <command>configure</command>.
- In other cases, alternate means are needed.</para>
+ In other cases, alternate means are needed. In a few cases, especially
+ glibc and gcc, the use of static libraries remains essential to the general
+ package building process. </para>
<para>For a more complete discussion of libraries, see the discussion
<ulink url="&blfs-root;/view/&short-version;/introduction/libraries.html">
diff --git a/chapter06/libcap.xml b/chapter06/libcap.xml
index cabcb1774..94fc94468 100644
--- a/chapter06/libcap.xml
+++ b/chapter06/libcap.xml
@@ -140,17 +140,6 @@ ln -sfv ../../lib/$(readlink /usr/lib/libcap.so) /usr/lib/libcap.so</userinput><
</listitem>
</varlistentry>
- <varlistentry id="libcap">
- <term><filename class="libraryfile">libcap</filename></term>
- <listitem>
- <para>Contains the library functions for manipulating POSIX 1003.1e
- capabilities</para>
- <indexterm zone="ch-system-libcap libcap">
- <primary sortas="c-libcap">libcap</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="setcap">
<term><command>setcap</command></term>
<listitem>
@@ -161,6 +150,16 @@ ln -sfv ../../lib/$(readlink /usr/lib/libcap.so) /usr/lib/libcap.so</userinput><
</listitem>
</varlistentry>
+ <varlistentry id="libcap">
+ <term><filename class="libraryfile">libcap</filename></term>
+ <listitem>
+ <para>Contains the library functions for manipulating POSIX 1003.1e
+ capabilities</para>
+ <indexterm zone="ch-system-libcap libcap">
+ <primary sortas="c-libcap">libcap</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
</variablelist>
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index 1bb55fed3..9308347e6 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -78,7 +78,7 @@
<!-- Don't remove the extra space, it prevet a FOP warning. -->
<term><command>m4 </command></term>
<listitem>
- <para>copies the given files while expanding the macros that they
+ <para>Copies the given files while expanding the macros that they
contain [These macros are either built-in or user-defined and can
take any number of arguments. Besides performing macro expansion,
<command>m4</command> has built-in functions for including named
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index cf1b1b2b2..f48ce59d4 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -242,7 +242,7 @@ unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
<term><command>instmodsh</command></term>
<listitem>
<para>Shell script for examining installed Perl modules,
- and can even create a tarball from an installed module</para>
+ and can create a tarball from an installed module</para>
<indexterm zone="ch-system-perl instmodsh">
<primary sortas="b-instmodsh">instmodsh</primary>
</indexterm>
diff --git a/chapter06/pkgconfig.xml b/chapter06/pkgconfig.xml
index a4383b11c..95b837ed3 100644
--- a/chapter06/pkgconfig.xml
+++ b/chapter06/pkgconfig.xml
@@ -106,7 +106,7 @@
<!-- Don't remove the extra space, it prevents a FOP warning. -->
<term><command>pkg-config </command></term>
<listitem>
- <para>returns meta information for the specified library or package
+ <para>Returns meta information for the specified library or package
</para>
<indexterm zone="ch-system-pkgconfig pkgconfig">
<primary sortas="b-pkgconfig">pkg-config</primary>
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index d3a7e52cc..1a42ce68c 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -40,7 +40,7 @@
<sect2 role="installation">
<title>Installation of Procps-ng</title>
- <para>Now prepare procps-ng for compilation:</para>
+ <para>Prepare procps-ng for compilation:</para>
<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr \
--exec-prefix= \
@@ -193,7 +193,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</useri
<varlistentry id="slabtop">
<term><command>slabtop</command></term>
<listitem>
- <para>Displays detailed kernel slap cache information in real time</para>
+ <para>Displays detailed kernel slab cache information in real time</para>
<indexterm zone="ch-system-procps slabtop">
<primary sortas="b-slabtop">slabtop</primary>
</indexterm>
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index d7f27b334..da1eb34a7 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -124,8 +124,8 @@ ln -sfv ../../lib/$(readlink /usr/lib/libhistory.so ) /usr/lib/libhistory.so</us
<varlistentry id="libreadline">
<term><filename class="libraryfile">libreadline</filename></term>
<listitem>
- <para>Aids in the consistency of user interface across discrete
- programs that need to provide a command line interface</para>
+ <para>Provides a set of commands for manipulating text entered in an
+ interactive session of a program.</para>
<indexterm zone="ch-system-readline libreadline">
<primary sortas="c-libreadline">libreadline</primary>
</indexterm>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index d90210985..c1f3b9a6a 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -76,8 +76,8 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \;</userinput></s
<screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
</note>
- <para>Make a minor change to make the default useradd consistent with the LFS
- groups file:</para>
+ <para>Make a minor change to make the first group number generated
+ by useradd 1000:</para>
<screen><userinput remap="pre">sed -i 's/1000/999/' etc/useradd</userinput></screen>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 9bd8fd6d0..6c8a79e19 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -123,13 +123,12 @@ meson --prefix=/usr \
</varlistentry>
<varlistentry>
- <term><parameter>-Dldconfig=no</parameter></term>
+ <term><parameter>-Dldconfig=false</parameter></term>
<listitem>
- <para>This switch prevents installation of a systemd
- unit that runs <command>ldconfig</command> at
- boot, making the boot time longer. Remove it if the
- described feature is desired, even though it's not
- useful for source distributions such as LFS.</para>
+ <para>This switch prevents installation of a systemd unit that runs
+ <command>ldconfig</command> at boot, which is not useful for source
+ distributions such as LFS and makes the boot time longer. Remove it
+ if the described feature is desired.</para>
</listitem>
</varlistentry>
@@ -158,7 +157,7 @@ meson --prefix=/usr \
services responsible for setting up the
<filename>/etc/group</filename> and
<filename>/etc/passwd</filename> files. Both files
- were created early in this chapter.</para>
+ were created earlier in this chapter.</para>
</listitem>
</varlistentry>
@@ -250,7 +249,7 @@ chmod 755 /lib/systemd/systemd-user-sessions</userinput></screen>
<varlistentry id="bootctl">
<term><command>bootctl</command></term>
<listitem>
- <para>used to query the firmware and boot manager settings</para>
+ <para>Used to query the firmware and boot manager settings</para>
<indexterm zone="ch-system-systemd bootctl">
<primary sortas="b-bootctl">bootctl</primary>
</indexterm>
@@ -306,8 +305,8 @@ chmod 755 /lib/systemd/systemd-user-sessions</userinput></screen>
<term><command>init</command></term>
<listitem>
<para>The first process to be started when the kernel has initialized
- the hardware which takes over the boot process and starts all the
- proceses it is instructed to</para>
+ the hardware which takes over the boot process and starts all
+ processes according to its configuration files</para>
<indexterm zone="ch-system-systemd init">
<primary sortas="b-init">init</primary>
</indexterm>
@@ -317,7 +316,7 @@ chmod 755 /lib/systemd/systemd-user-sessions</userinput></screen>
<varlistentry id="journalctl">
<term><command>journalctl</command></term>
<listitem>
- <para>Used to query the contents of the systemd Journal</para>
+ <para>Used to query the contents of the systemd journal</para>
<indexterm zone="ch-system-systemd journalctl">
<primary sortas="b-journalctl">journalctl</primary>
</indexterm>
@@ -558,7 +557,7 @@ chmod 755 /lib/systemd/systemd-user-sessions</userinput></screen>
<varlistentry id="systemd-mount">
<term><command>systemd-mount</command></term>
<listitem>
- <para>is a tool to temporarily mount or auto-mount a drive.</para>
+ <para>A tool to temporarily mount or auto-mount a drive.</para>
<indexterm zone="ch-system-systemd systemd-mount">
<primary sortas="b-systemd-mount">systemd-mount</primary>
</indexterm>
@@ -632,7 +631,7 @@ chmod 755 /lib/systemd/systemd-user-sessions</userinput></screen>
<varlistentry id="systemd-socket-activate">
<term><command>systemd-socket-activate</command></term>
<listitem>
- <para>is a tool to listen on socket devices and launch a process upon
+ <para>A tool to listen on socket devices and launch a process upon
connection.</para>
<indexterm zone="ch-system-systemd systemd-socket-activate">
<primary sortas="b-systemd-socket-activate">systemd-socket-activate</primary>
@@ -688,9 +687,9 @@ chmod 755 /lib/systemd/systemd-user-sessions</userinput></screen>
<varlistentry id="udevadm">
<term><command>udevadm</command></term>
<listitem>
- <para>Generic Udev administration tool: controls the udevd daemon,
+ <para>Generic udev administration tool: controls the udevd daemon,
provides info from the Udev database, monitors uevents, waits for
- uevents to finish, tests Udev configuration, and triggers uevents
+ uevents to finish, tests udev configuration, and triggers uevents
for a given device</para>
<indexterm zone="ch-system-systemd udevadm">
<primary sortas="b-udevadm">udevadm</primary>
@@ -701,7 +700,7 @@ chmod 755 /lib/systemd/systemd-user-sessions</userinput></screen>
<varlistentry id="libsystemd">
<term><filename class="libraryfile">libsystemd</filename></term>
<listitem>
- <para>systemd utility library</para>
+ <para>The main systemd utility library</para>
<indexterm zone="ch-system-systemd libsystemd">
<primary sortas="c-libsystemd">libsystemd</primary>
</indexterm>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 1a78af502..5973081e4 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -1124,7 +1124,7 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
<term><command>uuidd</command></term>
<listitem>
<para>A daemon used by the UUID library to generate time-based
- UUIDs in a secure and guranteed-unique fashion</para>
+ UUIDs in a secure and guaranteed-unique fashion</para>
<indexterm zone="ch-system-util-linux uuidd">
<primary sortas="b-uuidd">uuidd</primary>
</indexterm>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 52e136c92..6b06c01f1 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -70,10 +70,11 @@
<screen><userinput remap="test">make -j1 test &amp;&gt; vim-test.log</userinput></screen>
- <para>However, this test suite outputs a lot of binary data to the screen,
- which can cause issues with the settings of the current terminal. This can
- be resolved by redirecting the output to a log file. A successful test
- will result in the words "ALL DONE" at completion.</para>
+ <para>The test suite outputs a lot of binary data to the screen. This can
+ cause issues with the settings of the current terminal. The problem can be
+ avoided by redirecting the output to a log file as shown above. A
+ successful test will result in the words "ALL DONE" in the log file
+ at completion.</para>
<para>Install the package:</para>
@@ -272,7 +273,7 @@ set spell</literal></screen>
<term><command>vimdiff</command></term>
<listitem>
<para>Edits two or three versions of a file with <command>vim</command>
- and show differences</para>
+ and shows differences</para>
<indexterm zone="ch-system-vim vimdiff">
<primary sortas="b-vimdiff">vimdiff</primary>
</indexterm>
diff --git a/chapter07/clock.xml b/chapter07/clock.xml
index f5e710ebe..7e6a91610 100644
--- a/chapter07/clock.xml
+++ b/chapter07/clock.xml
@@ -65,11 +65,11 @@ EOF</userinput></screen>
<screen role="nodump"><userinput>timedatectl set-timezone TIMEZONE</userinput></screen>
- <para>You can get list of available time zones by running:</para>
+ <para>You can get a list of available time zones by running:</para>
<screen role="nodump"><userinput>timedatectl list-timezones</userinput></screen>
- <note><para>Please note that <command>timedatectl</command> command can
+ <note><para>Please note that the <command>timedatectl</command> command can
be used only on a system booted with systemd.</para></note>
<sect2>
diff --git a/chapter07/consoled.xml b/chapter07/consoled.xml
index f9d2ea0d5..c1bbf649e 100644
--- a/chapter07/consoled.xml
+++ b/chapter07/consoled.xml
@@ -86,8 +86,8 @@ EOF</userinput></screen>
<screen role="nodump"><userinput>localectl set-keymap MAP</userinput></screen>
- <note><para>Please note that <command>localectl</command> command can
- be used only on a system booted with systemd.</para></note>
+ <note><para>Please note that the <command>localectl</command> command can
+ be used only on a system booted with systemd.</para></note>
<para>You can also use <command>localectl</command> utility with the
corresponding parameters to change X11 keyboard layout, model, variant
@@ -131,7 +131,7 @@ EOF</userinput></screen>
</variablelist>
- <note><para>Using any of the parameters listed above requires
+ <note><para>Using any of the parameters listed above requires the
XKeyboard Config package from BLFS.</para></note>
</sect1>
diff --git a/chapter07/inputrc.xml b/chapter07/inputrc.xml
index 0c11c8bde..1be3e0958 100644
--- a/chapter07/inputrc.xml
+++ b/chapter07/inputrc.xml
@@ -15,7 +15,7 @@
</indexterm>
<para>The <filename>inputrc</filename> file is the configuration file for
- Readline library, which provides editing capabilities while the user is
+ then Readline library, which provides editing capabilities while the user is
entering a line from the terminal. It works by tranlating keyboard inputs
into specific actions. Readline is used by Bash and most other shells as
well as many other applications.</para>
diff --git a/chapter07/locale.xml b/chapter07/locale.xml
index 3e6c2aa7a..b70f6d36b 100644
--- a/chapter07/locale.xml
+++ b/chapter07/locale.xml
@@ -118,9 +118,9 @@ LC_ALL=&lt;locale name&gt; locale int_prefix</userinput></screen>
<literal>LANG=<replaceable>&lt;ll&gt;_&lt;CC&gt;.&lt;charmap&gt;&lt;@modifiers&gt;</replaceable></literal>
EOF</userinput></screen>
- <para>Note that you can modify <filename>/etc/locale.conf</filename> with
- systemd <command>localectl</command> utility. To use <command>localectl</command>
- for the example above, run:</para>
+ <para>Note that you can modify <filename>/etc/locale.conf</filename> with the
+ systemd <command>localectl</command> utility. To use
+ <command>localectl</command> for the example above, run:</para>
<screen role="nodump"><userinput>localectl set-locale LANG="<replaceable>&lt;ll&gt;_&lt;CC&gt;.&lt;charmap&gt;&lt;@modifiers&gt;</replaceable>"</userinput></screen>
@@ -132,8 +132,8 @@ EOF</userinput></screen>
<screen role="nodump"><userinput>localectl set-locale LANG="en_US.UTF-8" LC_CTYPE="en_US"</userinput></screen>
- <note><para>Please note that <command>localectl</command> command can
- be used only on a system booted with systemd.</para></note>
+ <note><para>Please note that the <command>localectl</command> command can
+ be used only on a system booted with systemd.</para></note>
<para>The <quote>C</quote> (default) and <quote>en_US</quote> (the recommended
one for United States English users) locales are different. <quote>C</quote>
diff --git a/chapter07/systemd-custom.xml b/chapter07/systemd-custom.xml
index 31f518ff2..8bf66999f 100644
--- a/chapter07/systemd-custom.xml
+++ b/chapter07/systemd-custom.xml
@@ -21,8 +21,8 @@
of options to control basic systemd operations. The default file has all
entries commented out with the default settings indicated. This file is
where the log level may be changed as well as some basic logging settings.
- See <filename>systemd-system.conf(5)</filename> manual page for details on
- each configuration option.</para>
+ See the <filename>systemd-system.conf(5)</filename> manual page for details
+ on each configuration option.</para>
</sect2>
@@ -212,21 +212,21 @@ EOF</userinput></screen>
<sect2>
<title>Long Running Processes</title>
- <para>Beginning with systemd-230, all user processes are killed when a
- user session is ended, even if nohup is used, or the process uses
- <function>daemon()</function> or <function>setsid()</function>. This is a
- deliberate change from a historically permissive environment to a more
- restrictive one. The new behavior may cause issues if you depend on long
- running programs (e.g., <command>screen</command> or
- <command>tmux</command>) to remain active after ending your user
- session. There are three ways to enable lingering processes to remain after
- a user session is ended.</para>
+ <para>Beginning with systemd-230, all user processes are killed when a user
+ session is ended, even if nohup is used, or the process uses the
+ <function>daemon()</function> or <function>setsid()</function> functions.
+ This is a deliberate change from a historically permissive environment to a
+ more restrictive one. The new behavior may cause issues if you depend on
+ long running programs (e.g., <command>screen</command> or
+ <command>tmux</command>) to remain active after ending your user session.
+ There are three ways to enable lingering processes to remain after a user
+ session is ended.</para>
<itemizedlist>
<listitem>
<para>
- <emphasis>Enable process lingering for only needed users</emphasis>:
- normal users have permission to enable process lingering
+ <emphasis>Enable process lingering for only selected users</emphasis>:
+ Normal users have permission to enable process lingering
with the command <command>loginctl enable-linger</command> for their
own user. System administrators can use the same command with a
<parameter>user</parameter> argument to enable for a user. That user
@@ -244,7 +244,7 @@ EOF</userinput></screen>
<listitem>
<para>
<emphasis>Enable system-wide process lingering</emphasis>:
- you can set <parameter>KillUserProcesses=no</parameter> in
+ You can set <parameter>KillUserProcesses=no</parameter> in
<filename>/etc/logind.conf</filename> to enable process lingering
globally for all users. This has the benefit of leaving the old
method available to all users at the expense of explicit control.
diff --git a/chapter07/udev.xml b/chapter07/udev.xml
index 9a18bc7ef..d3bbd85fb 100644
--- a/chapter07/udev.xml
+++ b/chapter07/udev.xml
@@ -209,12 +209,13 @@
<title>A kernel module is not loaded automatically, and Udev is not
intended to load it</title>
- <para>If the <quote>wrapper</quote> module only enhances the functionality
- provided by some other module (e.g., <emphasis>snd-pcm-oss</emphasis>
- enhances the functionality of <emphasis>snd-pcm</emphasis> by making the
- sound cards available to OSS applications), configure
- <command>modprobe</command> to load the wrapper after Udev loads the
- wrapped module. To do this, add a <quote>softdep</quote> line in any
+ <para>If the <quote>wrapper</quote> module only enhances the
+ functionality provided by some other module (e.g.,
+ <emphasis>snd-pcm-oss</emphasis> enhances the functionality of
+ <emphasis>snd-pcm</emphasis> by making the sound cards available to OSS
+ applications), configure <command>modprobe</command> to load the wrapper
+ after Udev loads the wrapped module. To do this, add a
+ <quote>softdep</quote> line to the corresponding
<filename>/etc/modprobe.d/<replaceable>&lt;filename&gt;</replaceable>.conf</filename>
file. For example:</para>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 635b67da8..5891511d2 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -72,7 +72,7 @@
configuration to a good state that takes your current system architecture
into account.</para>
- <para>Be sure to enable or disable following features or the system might
+ <para>Be sure to enable or disable the following features or the system might
not work correctly or boot at all:</para>
<screen role="nodump" revision="sysv">
@@ -217,10 +217,10 @@ File systems ---&gt;
the <filename class="directory">/boot</filename> directory.</para>
<caution>
- <para>If the host system has a separate /boot partition, the
- files copied below should go there. The easiest way to do that
- is to bind /boot on the host to /mnt/lfs/boot before proceeding.
- As the root user in the <emphasis>host system</emphasis>:</para>
+ <para>If the host system has a separate /boot partition, the files copied
+ below should go there. The easiest way to do that is to bind /boot on the
+ host (outside chroot) to /mnt/lfs/boot before proceeding. As the root
+ user in the <emphasis>host system</emphasis>:</para>
<screen role="nodump"><userinput>mount --bind /boot /mnt/lfs/boot</userinput></screen>
</caution>
@@ -231,9 +231,9 @@ File systems ---&gt;
the automatic setup of the boot process described in the next section. The
following command assumes an x86 architecture:</para>
-<screen revision="sysv"><userinput remap="install">cp -v arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
+<screen revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
-<screen revision="systemd"><userinput remap="install">cp -v arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;</userinput></screen>
+<screen revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;</userinput></screen>
<para><filename>System.map</filename> is a symbol file for the kernel.
It maps the function entry points of every function in the kernel API,
@@ -241,7 +241,7 @@ File systems ---&gt;
kernel. It is used as a resource when investigating kernel problems.
Issue the following command to install the map file:</para>
-<screen><userinput remap="install">cp -v System.map /boot/System.map-&linux-version;</userinput></screen>
+<screen><userinput remap="install">cp -iv System.map /boot/System.map-&linux-version;</userinput></screen>
<para>The kernel configuration file <filename>.config</filename>
produced by the <command>make menuconfig</command> step
@@ -249,7 +249,7 @@ File systems ---&gt;
that was just compiled. It is a good idea to keep this file for future
reference:</para>
-<screen><userinput remap="install">cp -v .config /boot/config-&linux-version;</userinput></screen>
+<screen><userinput remap="install">cp -iv .config /boot/config-&linux-version;</userinput></screen>
<para>Install the documentation for the Linux kernel:</para>
diff --git a/general.ent b/general.ent
index 13badd862..7853c6315 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20171226">
+<!ENTITY version "SVN-20171227">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
-<!ENTITY versiond "20171226-systemd">
+<!ENTITY versiond "20171227-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "December 26, 2017">
+<!ENTITY releasedate "December 27, 2017">
<!ENTITY copyrightdate "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.2">
diff --git a/prologue/architecture.xml b/prologue/architecture.xml
index 1a7ad8ab5..a6a456c83 100644
--- a/prologue/architecture.xml
+++ b/prologue/architecture.xml
@@ -22,9 +22,9 @@ computer.</para>
<para>Some other facts about 64-bit systems need to be added here. When
compared to a 32-bit system, the sizes of executable programs are slightly
-larger and the execution speeds are only slightly faster. For example, in a
-test build of LFS-6.5 on a Core2Duo CPU based system, the following statistics
-were measured:</para>
+larger and the execution speeds of arbitrary programs are only slightly faster.
+For example, in a test build of LFS-6.5 on a Core2Duo CPU based system, the
+following statistics were measured:</para>
<screen><computeroutput>Architecture Build Time Build Size
32-bit 198.5 minutes 648 MB
@@ -35,6 +35,11 @@ the 32-bit build. The gain from going to a 64-bit system is relatively
minimal. Of course, if you have more than 4GB of RAM or want to manipulate
data that exceeds 4GB, the advantages of a 64-bit system are substantial.</para>
+<note><para>The above discussion is only appropriate when comparing
+builds on the same hardware. Modern 64-bit systems are considerably
+faster than older 64-bit systems and the LFS authors recommend building
+on a 64-bit system when given a choice.</para></note>
+
<para>The default 64-bit build that results from LFS is considered a "pure"
64-bit system. That is, it supports 64-bit executables only. Building a
"multi-lib" system requires compiling many applications twice, once for a
diff --git a/prologue/audience.xml b/prologue/audience.xml
index b333ff6d6..03f92dce3 100644
--- a/prologue/audience.xml
+++ b/prologue/audience.xml
@@ -45,7 +45,7 @@ fixes the problem.</para>
<para>The goal of Linux From Scratch is to build a complete and usable
foundation-level system. If you do not wish to build your own Linux system
-from scratch, you may not entirely benefit from the information in this
+from scratch, you may nevertheless benefit from the information in this
book.</para>
<para>There are too many other good reasons to build your own LFS system to
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-27 10:56:28 +0000