aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Labastie <pieere@linuxfromscratch.org>2020-06-03 04:57:46 +0000
committerPierre Labastie <pieere@linuxfromscratch.org>2020-06-03 04:57:46 +0000
commitc3007946a7b0b2c6c19929a1a933ce7fe1558525 (patch)
tree9d89dcb89de96009f7c6cd45a8a6eb48ddb70efb
parentaa990c980fbcbb265a3da648f35cf8bd72ba0ae2 (diff)
Update to upstream r11892
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11893 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter03/introduction.xml30
-rw-r--r--chapter07/network.xml2
-rw-r--r--chapter07/networkd.xml2
3 files changed, 28 insertions, 6 deletions
diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml
index e67e62497..7a7626d92 100644
--- a/chapter03/introduction.xml
+++ b/chapter03/introduction.xml
@@ -49,9 +49,28 @@
<screen role="nodump"><userinput>chmod -v a+wt $LFS/sources</userinput></screen>
- <para>An easy way to download all of the packages and patches is by using
- <ulink url="../wget-list">wget-list</ulink> as an input to
- <command>wget</command>. For example:</para>
+ <para>There are several ways to optain all the necessary packages and patches
+ to build LFS:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>The files can be downloaded individually as described in the
+ next two sections.</para>
+ </listitem>
+ <listitem>
+ <para>For stable versions of the book, a tarball of all the needed files
+ can be downloaded from one of the LFS files mirrors listed at
+ <ulink url="http://www.linuxfromscratch.org/mirrors.html#files"/>.</para>
+ </listitem>
+ <listitem>
+ <para>The files can be downloaded using <command>wget</command> and
+ a wget-list as described below.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>To download all of the packages and patches by using
+ <ulink url="../wget-list">wget-list</ulink> as an input to the
+ <command>wget</command> command, use:</para>
<screen role="nodump"><userinput>wget --input-file=wget-list --continue --directory-prefix=$LFS/sources</userinput></screen>
@@ -61,7 +80,10 @@
<filename class="directory">$LFS/sources</filename> and run:</para>
<screen role="nodump"><userinput>pushd $LFS/sources
-md5sum -c md5sums
+ md5sum -c md5sums
popd</userinput></screen>
+ <para>This check can be used after retrieving the needed files with any of the
+ methods listed above.</para>
+
</sect1>
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 2a86df669..b527258ee 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -208,7 +208,7 @@ EOF</userinput></screen>
<screen><userinput>cat &gt; /etc/hosts &lt;&lt; "EOF"
<literal># Begin /etc/hosts
-127.0.0.1 localhost
+127.0.0.1 localhost.localdomain localhost
127.0.1.1 <replaceable>&lt;FQDN&gt;</replaceable> <replaceable>&lt;HOSTNAME&gt;</replaceable>
<replaceable>&lt;192.168.1.1&gt;</replaceable> <replaceable>&lt;FQDN&gt;</replaceable> <replaceable>&lt;HOSTNAME&gt;</replaceable> <replaceable>[alias1] [alias2 ...]</replaceable>
::1 localhost ip6-localhost ip6-loopback
diff --git a/chapter07/networkd.xml b/chapter07/networkd.xml
index b95d9b390..688c315aa 100644
--- a/chapter07/networkd.xml
+++ b/chapter07/networkd.xml
@@ -294,7 +294,7 @@ EOF</userinput></screen>
<screen role="nodump"><userinput>cat &gt; /etc/hosts &lt;&lt; "EOF"
<literal># Begin /etc/hosts
-127.0.0.1 localhost
+127.0.0.1 localhost.localdomain localhost
127.0.1.1 <replaceable>&lt;FQDN&gt;</replaceable> <replaceable>&lt;HOSTNAME&gt;</replaceable>
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes