[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.0.0-811-g3a85bbd
git
git at cross-lfs.org
Thu Jan 23 22:10:40 PST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, systemd has been updated
via 3a85bbdadc162dc77600f2682c504963a22826ff (commit)
via 0125883eb4db3f20fecfa05498af6357d7a7a243 (commit)
from 15f0ac62e4beeb827f10a2779fe667e5f364e9d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3a85bbdadc162dc77600f2682c504963a22826ff
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 24 00:11:51 2014 -0600
Add dhcpcd at .service to list of installed systemd units.
diff --git a/BOOK/network/common/network-scripts.xml b/BOOK/network/common/network-scripts.xml
index c77fa88..dcae434 100644
--- a/BOOK/network/common/network-scripts.xml
+++ b/BOOK/network/common/network-scripts.xml
@@ -46,7 +46,7 @@
<seglistitem>
<seg>ifdown, ifup, ipv4-static</seg>
- <seg>ifupdown at .service, nscd.service</seg>
+ <seg>ifupdown at .service, dhcpcd at .service, nscd.service</seg>
<seg>/etc/sysconfig, /lib/services, /lib/lsb (symbolic link)</seg>
</seglistitem>
</segmentedlist>
commit 0125883eb4db3f20fecfa05498af6357d7a7a243
Author: William Harrington <kb0iic at berzerkula.org>
Date: Fri Jan 24 00:09:00 2014 -0600
Rewrite dhcp.xml for systemd control utilizing the dhcpcd at service unit.
diff --git a/BOOK/network/common/dhcp.xml b/BOOK/network/common/dhcp.xml
index 33cb3cc..104ec7a 100644
--- a/BOOK/network/common/dhcp.xml
+++ b/BOOK/network/common/dhcp.xml
@@ -8,42 +8,57 @@
<sect1 id="ch-network-dhcp">
<?dbhtml filename="network-dhcp.html"?>
- <title>DHCP Networking Configuration</title>
+ <title>DHCP Network Configuration</title>
<sect2>
- <title>Creating the DHCP Network Interface Configuration Files</title>
+ <title>Creating the DHCP Network Interface Configuration File</title>
- <para>The following is an example for the eth0 interface. Create the
- <filename>/etc/sysconfig/ifconfig.eth0</filename>
- configuration file using the following commands. Adjust appropriately for
- additional interfaces:</para>
+ <para>The following is an example for the eth0 interface. Refer to the
+ dhcpcd.conf man page for more information. This step may be skipped if
+ default behavior of dhcpcd is required.</para>
-<screen><userinput>mkdir -pv /etc/sysconfig &&
-cd /etc/sysconfig &&
-cat > ifconfig.eth0 << "EOF"
-<literal>SERVICE="dhcpcd"
+ <para>Create the <filename>/etc/dhcpcd.conf</filename> configuration file
+ using the following commands. Adjust appropriately for additional options:</para>
-# Start Command for DHCPCD
-DHCP_START="-q"
+<screen><userinput>cd /etc &&
+cat > dhcpcd.conf << "EOF"
+<literal># dhcpcd configuration eth0 interface
+# See dhcpcd.conf(5) for details.
-# Stop Command for DHCPCD
-DHCP_STOP="-k"</literal>
+interface eth0
+# dhcpcd-run-hooks uses these options.
+option subnet_mask, routers, domain_name_servers
+
+# The default timeout for waiting for a DHCP response is 30 seconds
+# which may be too long or too short and can be changed here.
+timeout 16</literal>
EOF</userinput></screen>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="static.xml"
- xpointer="xpointer(//*[@os='var-ob'])"/>
+ <para>To configure another Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
+
+ </sect2>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="static.xml"
- xpointer="xpointer(//*[@os='var-s'])"/>
+ <sect2>
+ <title>Configuring the Network Interface at boot</title>
- <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>Enabling of the Network Interface configuration is
+ done per interface. To enable Network Interface
+ configuration at boot, run:</para>
- <para>To configure another Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
+<screen role="nodump"><userinput>systemctl enable dhcpcd at eth0</userinput></screen>
+
+ <para>To disable previously enabled Network Interface
+ configuration at boot, run:</para>
+
+<screen role="nodump"><userinput>systemctl disable dhcpcd at eth0</userinput></screen>
+
+ <para>To manually start the Network Interface configuration,
+ run:</para>
+
+<screen role="nodump"><userinput>systemctl start dhcpcd at eth0</userinput></screen>
+
+ <para>Replace eth0 with the correct Network Interface
+ name as described on the beginning of this page.</para>
</sect2>
-----------------------------------------------------------------------
Summary of changes:
BOOK/network/common/dhcp.xml | 65 +++++++++++++++++++------------
BOOK/network/common/network-scripts.xml | 2 +-
2 files changed, 41 insertions(+), 26 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list