소스 검색

Update /etc/hosts in network configuration.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11204 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
DJ Lucas 8 년 전
부모
커밋
bd4a1d9bf9
4개의 변경된 파일38개의 추가작업 그리고 13개의 파일을 삭제
  1. 9 0
      chapter01/changelog.xml
  2. 13 4
      chapter07/network.xml
  3. 13 6
      chapter07/networkd.xml
  4. 3 3
      general.ent

+ 9 - 0
chapter01/changelog.xml

@@ -42,6 +42,15 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     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>

+ 13 - 4
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>

+ 13 - 6
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

+ 3 - 3
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">