aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2021-08-20 15:48:12 -0500
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2021-08-20 15:48:12 -0500
commit0e89a47eff256aedac2b9c7437b8645ee11ab9e1 (patch)
tree63e03936c8fc1c8f5243983cecfb4670b3da5ce6
parentde8b6cb08abf05452b2e26dcc0329954bb98e822 (diff)
parent3089d454c0c29589b94fb587bc7be62679816868 (diff)
Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk
-rw-r--r--appendices/dependencies.xml3
-rw-r--r--chapter02/hostreqs.xml4
-rw-r--r--chapter11/reboot.xml8
3 files changed, 12 insertions, 3 deletions
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index f99b47b77..e2a8e2f06 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -2577,7 +2577,8 @@
<seglistitem>
<seg>
<ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
- <ulink url="&blfs-book;server/sqlite.html"> SQLite</ulink>, and
+ <ulink url="&blfs-book;basicnet/libnsl.html">libnsl</ulink>,
+ <ulink url="&blfs-book;server/sqlite.html">SQLite</ulink>, and
<ulink url="&blfs-book;general/tk.html">Tk</ulink>
</seg>
</seglistitem>
diff --git a/chapter02/hostreqs.xml b/chapter02/hostreqs.xml
index 0ba38e1db..e513bd92d 100644
--- a/chapter02/hostreqs.xml
+++ b/chapter02/hostreqs.xml
@@ -85,7 +85,9 @@
<para><emphasis role="strong">Linux Kernel-&min-kernel;</emphasis></para>
<para>The reason for the kernel version requirement is that we specify
- that version when building <application>glibc</application> in Chapter&nbsp;6
+ that version when building <application>glibc</application> in
+ <xref linkend="chapter-cross-tools"/> and
+ <xref linkend="chapter-building-system"/>,
at the recommendation of the developers. It is also required by
udev.</para>
diff --git a/chapter11/reboot.xml b/chapter11/reboot.xml
index 5ecd2a2f7..bce0e6ea9 100644
--- a/chapter11/reboot.xml
+++ b/chapter11/reboot.xml
@@ -36,7 +36,8 @@
you to perform copy/paste actions in your virtual
terminals.</para></listitem>
- <listitem><para>If you are in a situation where static IP configuration
+ <listitem revision="sysv"><para>
+ If you are in a situation where static IP configuration
does not meet your networking requirements, installing a package
such as <ulink url='&blfs-book;basicnet/dhcpcd.html'>dhcpcd</ulink>
or the client portion of <ulink
@@ -57,6 +58,11 @@
<ulink url='&blfs-book;basicnet/wget.html'>wget</ulink>.
</para></listitem>
+ <listitem><para>To connect to a wireless access point for networking,
+ install
+ <ulink url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
+ </para></listitem>
+
<listitem><para>Finally, a review of the following configuration files
is also appropriate at this point. </para>