aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml9
-rw-r--r--chapter07/network.xml17
-rw-r--r--chapter07/networkd.xml19
-rw-r--r--general.ent6
4 files changed, 38 insertions, 13 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0456ea2f0..62791290d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,15 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
+ <para>2017-03-08</para>
+ <itemizedlist>
+ <listitem>
+ <para>[dj] - Update /etc/hosts in network configuration.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2017-03-03</para>
<itemizedlist>
<listitem>
diff --git a/chapter07/network.xml b/chapter07/network.xml
index f95f0e26d..942276478 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -267,13 +267,18 @@ EOF</userinput></screen>
<literal># Begin /etc/hosts (network card version)
127.0.0.1 localhost
-<replaceable>&lt;192.168.1.1&gt;</replaceable> <replaceable>&lt;HOSTNAME.example.org&gt;</replaceable> <replaceable>[alias1] [alias2 ...]</replaceable>
+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
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
# End /etc/hosts (network card version)</literal>
EOF</userinput></screen>
- <para>The <replaceable>&lt;192.168.1.1&gt;</replaceable> and
- <replaceable>&lt;HOSTNAME.example.org&gt;</replaceable> values need to be
+ <para>The <replaceable>&lt;192.168.1.1&gt;</replaceable>,
+ <replaceable>&lt;FQDN&gt;</replaceable>, and
+ <replaceable>&lt;HOSTNAME&gt;</replaceable> values need to be
changed for specific uses or requirements (if assigned an IP address by a
network/system administrator and the machine will be connected to an
existing network). The optional alias name(s) can be omitted.</para>
@@ -284,7 +289,11 @@ EOF</userinput></screen>
<screen role="nodump"><userinput>cat &gt; /etc/hosts &lt;&lt; "EOF"
<literal># Begin /etc/hosts (no network card version)
-127.0.0.1 <replaceable>&lt;HOSTNAME.example.org&gt;</replaceable> <replaceable>&lt;HOSTNAME&gt;</replaceable> localhost
+127.0.0.1 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
+ff02::2 ip6-allrouters
# End /etc/hosts (no network card version)</literal>
EOF</userinput></screen>
diff --git a/chapter07/networkd.xml b/chapter07/networkd.xml
index 2087bc70f..1ce19b8c1 100644
--- a/chapter07/networkd.xml
+++ b/chapter07/networkd.xml
@@ -237,14 +237,18 @@ EOF</userinput></screen>
<screen role="nodump"><userinput>cat &gt; /etc/hosts &lt;&lt; "EOF"
<literal># Begin /etc/hosts
-127.0.0.1 <replaceable>&lt;HOSTNAME.example.org&gt;</replaceable> <replaceable>&lt;HOSTNAME&gt;</replaceable> localhost <replaceable>[alias1] [alias2] ...</replaceable>
-::1 <replaceable>&lt;HOSTNAME.example.org&gt;</replaceable> <replaceable>&lt;HOSTNAME&gt;</replaceable> localhost <replaceable>[alias1] [alias2] ...</replaceable>
+127.0.0.1 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
+ff02::2 ip6-allrouters
# End /etc/hosts</literal>
EOF</userinput></screen>
<para>The ::1 entry is the IPv6 counterpart of 127.0.0.1 and represents
-the IPv6 loopback interface.</para>
+ the IPv6 loopback interface. 127.0.1.1 is a loopback entry reserved
+ specifically for the FQDN.</para>
<para>If using a static address, create the <filename>/etc/hosts</filename>
file by running this command instead:</para>
@@ -253,14 +257,17 @@ the IPv6 loopback interface.</para>
<literal># Begin /etc/hosts
127.0.0.1 localhost
-::1 localhost
-<replaceable>&lt;192.168.0.2&gt;</replaceable> <replaceable>&lt;HOSTNAME.example.org&gt;</replaceable> <replaceable>&lt;HOSTNAME&gt;</replaceable> <replaceable>[alias1] [alias2] ...</replaceable>
+127.0.1.1 <replaceable>&lt;FQDN&gt;</replaceable> <replaceable>&lt;HOSTNAME&gt;</replaceable>
+<replaceable>&lt;192.168.0.2&gt;</replaceable> <replaceable>&lt;FQDN&gt;</replaceable> <replaceable>&lt;HOSTNAME&gt;</replaceable> <replaceable>[alias1] [alias2] ...</replaceable>
+::1 localhost ip6-localhost ip6-loopback
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
# End /etc/hosts</literal>
EOF</userinput></screen>
<para>The <replaceable>&lt;192.168.0.2&gt;</replaceable>,
- <replaceable>&lt;HOSTNAME.example.org&gt;</replaceable>, and
+ <replaceable>&lt;FQDN&gt;</replaceable>, and
<replaceable>&lt;HOSTNAME&gt;</replaceable> values need to be
changed for specific uses or requirements (if assigned an IP address by a
network/system administrator and the machine will be connected to an
diff --git a/general.ent b/general.ent
index 8460eb70e..ee04b7e5b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20170303">
+<!ENTITY version "SVN-20170308">
<!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 "20170303-systemd">
+<!ENTITY versiond "20170308-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "March 3, 2017">
+<!ENTITY releasedate "March 8, 2017">
<!ENTITY copyrightdate "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.1">