Changeset 572d0a6 for BOOK

Timestamp:

Mar 2, 2009, 11:45:02 AM (16 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

7a39f29

Parents:

1b896d0

Message:

Update text around the configuration of Static and DHCP IPs.

Location:

BOOK/network/common

Files:

• dhcp.xml (modified) (1 diff)
• static.xml (modified) (2 diffs)

BOOK/network/common/dhcp.xml

@@ -40 +40 @@
 </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>
 

BOOK/network/common/static.xml

@@ -37 +37 @@
 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
@@ -44 +44 @@
     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