[Clfs-commits] commit: r4798 - in /trunk/BOOK/network/common: dhcp.xml static.xml

[svn at cross-lfs.org]

Author: jciccone
Date: Mon Mar  2 19:45:02 2009
New Revision: 4798

Log:
Update text around the configuration of Static and DHCP IPs.

Modified:
    trunk/BOOK/network/common/dhcp.xml
    trunk/BOOK/network/common/static.xml

Modified: trunk/BOOK/network/common/dhcp.xml
==============================================================================
--- trunk/BOOK/network/common/dhcp.xml (original)
+++ trunk/BOOK/network/common/dhcp.xml Mon Mar  2 19:45:02 2009
@@ -39,6 +39,19 @@
 EOF</literal>
 </userinput></screen>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="static.xml"
+    xpointer="xpointer(//*[@os='var-ob'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="static.xml"
+    xpointer="xpointer(//*[@os='var-s'])"/>
+
+    <para>The <envar>DHCP_START</envar> and <envar>DHCP_STOP</envar> variables
+    arguments that are passed onto <filename>dhcpcd</filename> when starting
+    and stoppping the service. More information about what can be passed can
+    be found in the <filename>dhcpcd(8)</filename> man page.</para>
+
     <para>To configure another Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
 
   </sect2>

Modified: trunk/BOOK/network/common/static.xml
==============================================================================
--- trunk/BOOK/network/common/static.xml (original)
+++ trunk/BOOK/network/common/static.xml Mon Mar  2 19:45:02 2009
@@ -36,19 +36,18 @@
 BROADCAST=192.168.1.255</literal>
 EOF</userinput></screen>
 
-    <para>The values of these variables must be changed in every file to match
+    <para os="var-ob">The values of these variables must be changed in every file to match
     the proper setup. If the <envar>ONBOOT</envar> variable is set to
     <quote>yes</quote> the network script will bring up the Network Interface
     Card (NIC) during booting of the system. If set to anything but
     <quote>yes</quote> the NIC will be ignored by the network script and not
     be brought up.</para>
 
-    <para>The <envar>SERVICE</envar> variable defines the method used for
+    <para os="var-s">The <envar>SERVICE</envar> variable defines the method used for
     obtaining the IP address. The CLFS-Bootscripts package has a modular IP
     assignment format, and creating additional files in the <filename
     class="directory">/etc/sysconfig/network-devices/services</filename>
-    directory allows other IP assignment methods. This is commonly used for
-    Dynamic Host Configuration Protocol (DHCP), which is addressed in CBLFS.</para>
+    directory allows other IP assignment methods.</para>
 
     <para>The <envar>GATEWAY</envar> variable should contain the default
     gateway IP address, if one is present. If not, then comment out the