[deployment-guide/comm-rel: 42/74] modified DHCP chapter to fix BZ#594562

dsilas dsilas at fedoraproject.org
Tue Jul 6 21:12:47 UTC 2010


commit 09215b349b06f3a68db6dc5c88cb0262e41f6725
Author: Martin Prpic <mprpic at redhat.com>
Date:   Fri Jun 25 15:39:52 2010 +0200

    modified DHCP chapter to fix BZ#594562

 en-US/Dynamic_Host_Configuration_Protocol_DHCP.xml |   28 ++++++++++----------
 1 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/en-US/Dynamic_Host_Configuration_Protocol_DHCP.xml b/en-US/Dynamic_Host_Configuration_Protocol_DHCP.xml
index 9c657ee..9b5bffd 100644
--- a/en-US/Dynamic_Host_Configuration_Protocol_DHCP.xml
+++ b/en-US/Dynamic_Host_Configuration_Protocol_DHCP.xml
@@ -37,13 +37,13 @@
     <para>The <filename>dhcp</filename> package contains an ISC DHCP server. First, install the package as the superuser:</para>
     <screen>~]# <command>yum install dhcp</command>
     </screen>
-    <para>Installing the <filename>dhcp</filename> package creates a file, <filename>/etc/dhcpd.conf</filename>, which is merely an empty configuration file:</para>
-    <screen>~]# <command>cat /etc/dhcpd.conf</command>
+    <para>Installing the <filename>dhcp</filename> package creates a file, <filename>/etc/dhcp/dhcpd.conf</filename>, which is merely an empty configuration file:</para>
+    <screen>~]# <command>cat /etc/dhcp/dhcpd.conf</command>
 #
 # DHCP Server Configuration file.
 #   see /usr/share/doc/dhcp*/dhcpd.conf.sample</screen>
     <para>The sample configuration file can be found at <filename
-        moreinfo="none">/usr/share/doc/dhcp-&lt;<replaceable>version</replaceable>&gt;/dhcpd.conf.sample</filename>. You should use this file to help you configure <filename>/etc/dhcpd.conf</filename>, which is explained in detail below.</para>
+        moreinfo="none">/usr/share/doc/dhcp-&lt;<replaceable>version</replaceable>&gt;/dhcpd.conf.sample</filename>. You should use this file to help you configure <filename>/etc/dhcp/dhcpd.conf</filename>, which is explained in detail below.</para>
     <para>DHCP also uses the file <filename>/var/lib/dhcpd/dhcpd.leases</filename> to store the client lease database. Refer to <xref
         linkend="lease-database"/> for more information.</para>
     <section
@@ -212,7 +212,7 @@ host apex {
         <title>Tip</title>
         <para>The sample configuration file provided can be used as a starting point and custom configuration options can be added to it. To copy it to the proper location, use the following command:</para>
 <screen>
-<command>cp /usr/share/doc/dhcp-<replaceable>&lt;version-number&gt;</replaceable>/dhcpd.conf.sample /etc/dhcpd.conf</command>
+<command>cp /usr/share/doc/dhcp-<replaceable>&lt;version-number&gt;</replaceable>/dhcpd.conf.sample /etc/dhcp/dhcpd.conf</command>
           </screen>
 					 <para>... where <replaceable>&lt;version-number&gt;</replaceable> is the DHCP version number.</para>
       </note>
@@ -295,7 +295,7 @@ DHCPDARGS=eth0
         <listitem>
           <para>
             <command>-cf <replaceable>&lt;filename&gt;</replaceable>
-            </command> — Specifies the location of the configuration file. The default location is <filename>/etc/dhcpd.conf</filename>.</para>
+            </command> — Specifies the location of the configuration file. The default location is <filename>/etc/dhcp/dhcpd.conf</filename>.</para>
         </listitem>
         <listitem>
           <para>
@@ -429,7 +429,7 @@ ONBOOT=yes
       <secondary>server configuration</secondary>
     </indexterm>
     <para>A multihomed DHCP server serves multiple networks, that is, multiple subnets. The examples in these sections detail how to configure a DHCP server to serve multiple networks, select which network interfaces to listen on, and how to define network settings for systems that move networks.</para>
-    <para>Before making any changes, back up the existing <filename>/etc/sysconfig/dhcpd</filename> and <filename>/etc/dhcpd.conf</filename> files.</para>
+    <para>Before making any changes, back up the existing <filename>/etc/sysconfig/dhcpd</filename> and <filename>/etc/dhcp/dhcpd.conf</filename> files.</para>
     <para>The DHCP daemon listens on all network interfaces unless otherwise specified. Use the <filename>/etc/sysconfig/dhcpd</filename> file to specify which network interfaces the DHCP daemon listens on. The following <filename>/etc/sysconfig/dhcpd</filename> example specifies that the DHCP daemon listens on the <filename>eth0</filename> and <filename>eth1</filename> interfaces:</para>
     <screen>
 DHCPDARGS="eth0 eth1";
@@ -438,7 +438,7 @@ DHCPDARGS="eth0 eth1";
     <screen>
 DHCPDARGS="eth0";
 </screen>
-    <para>The following is a basic <filename>/etc/dhcpd.conf</filename> file, for a server that has two network interfaces, <filename>eth0</filename> in a 10.0.0.0/24 network, and <filename>eth1</filename> in a 172.16.0.0/24 network. Multiple <computeroutput>subnet</computeroutput> declarations allow different settings to be defined for multiple networks:</para>
+    <para>The following is a basic <filename>/etc/dhcp/dhcpd.conf</filename> file, for a server that has two network interfaces, <filename>eth0</filename> in a 10.0.0.0/24 network, and <filename>eth1</filename> in a 172.16.0.0/24 network. Multiple <computeroutput>subnet</computeroutput> declarations allow different settings to be defined for multiple networks:</para>
     <screen>
 ddns-update-style <replaceable>interim</replaceable>;
 default-lease-time <replaceable>600</replaceable>;
@@ -503,7 +503,7 @@ dhcpd: Not configured to listen on any interfaces!
     <para>For further information, refer to the <computeroutput>dhcpd.conf(5)</computeroutput> man page.</para>
     <warning>
       <title>Alias Interfaces</title>
-      <para>Alias interfaces are not supported by DHCP. If an alias interface is the only interface, in the only subnet specified in <filename>/etc/dhcpd.conf</filename>, the DHCP daemon fails to start.</para>
+      <para>Alias interfaces are not supported by DHCP. If an alias interface is the only interface, in the only subnet specified in <filename>/etc/dhcp/dhcpd.conf</filename>, the DHCP daemon fails to start.</para>
     </warning>
     <section
       id="sect-dns_Host_Configuration">
@@ -513,10 +513,10 @@ dhcpd: Not configured to listen on any interfaces!
         <primary>Multihomed DHCP</primary>
         <secondary>host configuration</secondary>
       </indexterm>
-      <para>Before making any changes, back up the existing <filename>/etc/sysconfig/dhcpd</filename> and <filename>/etc/dhcpd.conf</filename> files.</para>
+      <para>Before making any changes, back up the existing <filename>/etc/sysconfig/dhcpd</filename> and <filename>/etc/dhcp/dhcpd.conf</filename> files.</para>
       <formalpara>
         <title>Configuring a single system for multiple networks</title>
-        <para>The following <filename>/etc/dhcpd.conf</filename> example creates two subnets, and configures an IP address for the same system, depending on which network it connects to:</para>
+        <para>The following <filename>/etc/dhcp/dhcpd.conf</filename> example creates two subnets, and configures an IP address for the same system, depending on which network it connects to:</para>
       </formalpara>
       <screen>
 ddns-update-style <replaceable>interim</replaceable>;
@@ -571,10 +571,10 @@ host example1 {
       </variablelist>
       <para>If <computeroutput>option</computeroutput> statements do not end with a semicolon, the DHCP daemon fails to start, and an error such as the following is logged to <filename>/var/log/messages</filename>:</para>
       <screen>
-/etc/dhcpd.conf line 20: semicolon expected.
+/etc/dhcp/dhcpd.conf line 20: semicolon expected.
 dhcpd: }
 dhcpd: ^
-dhcpd: /etc/dhcpd.conf line 38: unexpected end of file
+dhcpd: /etc/dhcp/dhcpd.conf line 38: unexpected end of file
 dhcpd:
 dhcpd: ^
 dhcpd: Configuration file errors encountered -- exiting
@@ -605,12 +605,12 @@ host interface1 {
       </itemizedlist>
       <para>When a name given in a <computeroutput>host</computeroutput> declaration is not unique, the DHCP daemon fails to start, and an error such as the following is logged to <filename>/var/log/messages</filename>:</para>
       <screen>
-dhcpd: /etc/dhcpd.conf line 31: host interface0: already exists
+dhcpd: /etc/dhcp/dhcpd.conf line 31: host interface0: already exists
 dhcpd: }
 dhcpd: ^
 dhcpd: Configuration file errors encountered -- exiting
 </screen>
-      <para>This error was caused by having multiple <computeroutput>host interface0</computeroutput> declarations defined in <filename>/etc/dhcpd.conf</filename>.</para>
+      <para>This error was caused by having multiple <computeroutput>host interface0</computeroutput> declarations defined in <filename>/etc/dhcp/dhcpd.conf</filename>.</para>
     </section>
   </section>
   <section


More information about the docs-commits mailing list