[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-622-g6757dca
git
git at cross-lfs.org
Sun Mar 30 20:41:51 PDT 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 6757dcabe155c6965c0fadb99a45ca9c54ac0a93 (commit)
via 31e77c043b8d3384be8312a5eeda5427f6a08161 (commit)
from ca8dde01978d93211a1db35e82eb09592469d464 (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 6757dcabe155c6965c0fadb99a45ca9c54ac0a93
Merge: 31e77c0 ca8dde0
Author: Chris Staub <chris at beaker67.com>
Date: Sun Mar 30 23:40:00 2014 -0400
Merge branch 'systemd' of git.cross-lfs.org:cross-lfs into systemd
commit 31e77c043b8d3384be8312a5eeda5427f6a08161
Author: Chris Staub <chris at beaker67.com>
Date: Sun Mar 30 23:39:45 2014 -0400
Updated network section
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 363f43d..f91e85f 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,10 @@
<para>30 March 2014</para>
<itemizedlist>
<listitem>
+ <para>[Chris] - Modified network section to split systemd/sysconfig
+ network configurations.</para>
+ </listitem>
+ <listitem>
<para>[Chris] - Removed instructions to install systemd manpages -
they are now automatically installed by default.</para>
</listitem>
diff --git a/BOOK/network/alpha-chapter.xml b/BOOK/network/alpha-chapter.xml
index 7d28e07..9021963 100644
--- a/BOOK/network/alpha-chapter.xml
+++ b/BOOK/network/alpha-chapter.xml
@@ -14,10 +14,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
</chapter>
diff --git a/BOOK/network/common/choose.xml b/BOOK/network/common/choose.xml
index 73b8041..32624b0 100644
--- a/BOOK/network/common/choose.xml
+++ b/BOOK/network/common/choose.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-network-choose">
<?dbhtml filename="choose.html"?>
- <title>DHCP or Static Networking?</title>
+ <title>Systemd Networking?</title>
<indexterm zone="ch-network-choose">
<primary sortas="d-network">network</primary>
@@ -23,8 +23,8 @@
a DHCP server to get all your configuration information. Static you become
responsible for setting up your options.</para>
- <para>To configure a Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
+ <para>To use systemd to configure a Network Interface, Follow <xref linkend="ch-systemd-network"/>.</para>
- <para>To configure a DHCP Interface, Follow <xref linkend="ch-network-dhcpcd"/>.</para>
+ <para>To use CLFS-network-scripts to configure a Network Interface, Follow <xref linkend="ch-scripts-network-scripts"/>.</para>
</sect1>
diff --git a/BOOK/network/common/dhcp.xml b/BOOK/network/common/dhcp.xml
deleted file mode 100644
index 104ec7a..0000000
--- a/BOOK/network/common/dhcp.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-network-dhcp">
- <?dbhtml filename="network-dhcp.html"?>
-
- <title>DHCP Network Configuration</title>
-
- <sect2>
- <title>Creating the DHCP Network Interface Configuration File</title>
-
- <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>
-
- <para>Create the <filename>/etc/dhcpcd.conf</filename> configuration file
- using the following commands. Adjust appropriately for additional options:</para>
-
-<screen><userinput>cd /etc &&
-cat > dhcpcd.conf << "EOF"
-<literal># dhcpcd configuration eth0 interface
-# See dhcpcd.conf(5) for details.
-
-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>
-
- <para>To configure another Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
-
- </sect2>
-
- <sect2>
- <title>Configuring the Network Interface at boot</title>
-
- <para>Enabling of the Network Interface configuration is
- done per interface. To enable Network Interface
- configuration at boot, run:</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>
-
-</sect1>
diff --git a/BOOK/network/common/dhcpcd.xml b/BOOK/network/common/dhcpcd.xml
index c122656..fb195ee 100644
--- a/BOOK/network/common/dhcpcd.xml
+++ b/BOOK/network/common/dhcpcd.xml
@@ -45,6 +45,58 @@
</sect2>
+ <sect2 id="conf-dhcpcd" role="configuration">
+ <title>Creating the DHCP Network Interface Configuration File</title>
+
+ <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>
+
+ <para>Create the <filename>/etc/dhcpcd.conf</filename> configuration file
+ using the following commands. Adjust appropriately for additional options:</para>
+
+<screen><userinput>cd /etc &&
+cat > dhcpcd.conf << "EOF"
+<literal># dhcpcd configuration eth0 interface
+# See dhcpcd.conf(5) for details.
+
+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>
+
+ <para>To configure another Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
+
+ </sect2>
+
+ <sect2>
+ <title>Configuring the Network Interface at boot</title>
+
+ <para>Enabling of the Network Interface configuration is
+ done per interface. To enable Network Interface
+ configuration at boot, run:</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>
+
<sect2 id="contents-dhcpcd" role="content">
<title>Contents of dhcpcd</title>
diff --git a/BOOK/network/common/static.xml b/BOOK/network/common/static.xml
deleted file mode 100644
index 45f6ba6..0000000
--- a/BOOK/network/common/static.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-network-static">
- <?dbhtml filename="network-static.html"?>
-
- <title>Static Networking Configuration</title>
-
- <sect2>
- <title>Creating the Static Network Interface Configuration Files</title>
-
- <para>Which interfaces are brought up and down by the network script
- depends on the files and directories in the <filename
- class="directory">/etc/sysconfig</filename> hierarchy.
- This directory should contain a sub-directory for each interface to be
- configured, such as <filename>ifconfig.xyz</filename>, where
- <quote>xyz</quote> is a network interface name. Inside this directory
- would be files defining the attributes to this interface, such as its IP
- address(es), subnet masks, and so forth.</para>
-
- <note><para>Udev may assign random Network Card Interface names
- for some network cards such as enp2s1. If you are not sure what
- your Network Card Interface name is, you can always run
- <command>ip l</command> after you have booted your system. Again,
- it is important that <filename>ifconfig.xyz</filename> is named
- after correct Network Card Interface name (e.g.
- <filename>ifconfig.enp2s1</filename> or
- <filename>ifconfig.eth0</filename>) or Systemd will fail to bring
- up your network interface.</para></note>
-
- <para>The following command creates a sample <filename>ipv4</filename>
- file for the <emphasis>eth0</emphasis> device:</para>
-
-<screen><userinput>mkdir -pv /etc/sysconfig &&
-cd /etc/sysconfig &&
-cat > ifconfig.eth0 << "EOF"
-<literal>IFACE="eth0"
-SERVICE="ipv4-static"
-IP="192.168.1.1"
-GATEWAY="192.168.1.2"
-PREFIX="24"
-BROADCAST="192.168.1.255"</literal>
-EOF</userinput></screen>
-
- <para os="var-ob">The values of these variables must be changed in every
- file to match the proper setup.</para>
-
- <para os="var-i">The <envar>IFACE</envar> variable defines the interface
- name, for example, eth0. It is required for all network device configuration
- files.</para>
-
- <para os="var-s">The <envar>SERVICE</envar> variable defines the method used
- for obtaining the IP address. The CLFS-Network-Scripts package has a modular
- IP assignment format, and creating additional files in the <filename
- class="directory">/lib/services</filename>
- 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
- variable entirely.</para>
-
- <para>The <envar>PREFIX</envar> variable needs to contain the number of
- bits used in the subnet. Each octet in an IP address is 8 bits. If the
- subnet's netmask is 255.255.255.0, then it is using the first three octets
- (24 bits) to specify the network number. If the netmask is 255.255.255.240,
- it would be using the first 28 bits. Prefixes longer than 24 bits are
- commonly used by DSL and cable-based Internet Service Providers (ISPs).
- In this example (PREFIX=24), the netmask is 255.255.255.0. Adjust the
- <envar>PREFIX</envar> variable according to your specific subnet.</para>
-
- <para>For more information see the <command>ifup</command> man page.</para>
-
- <para>To configure another DHCP Interface, Follow <xref linkend="ch-network-dhcp"/>.</para>
-
- </sect2>
-
- <sect2>
- <title>Configuring the Network Interface at boot</title>
-
- <para>Enabling of the Network Interface configuration is
- done per interface. To enable Network Interface
- configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl enable ifupdown at eth0</userinput></screen>
-
- <para>To disable previously enabled Network Interface
- configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl disable ifupdown at eth0</userinput></screen>
-
- <para>To manually start the Network Interface configuration,
- run:</para>
-
-<screen role="nodump"><userinput>systemctl start ifupdown at eth0</userinput></screen>
-
- <para>Replace eth0 with the correct Network Interface
- name as described on the beginning of this page.</para>
-
- </sect2>
-
-</sect1>
diff --git a/BOOK/network/common/sysconfig-network.xml b/BOOK/network/common/sysconfig-network.xml
index e69de29..e7c437c 100644
--- a/BOOK/network/common/sysconfig-network.xml
+++ b/BOOK/network/common/sysconfig-network.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-network-static">
+ <?dbhtml filename="network-static.html"?>
+
+ <title>Static Networking Configuration</title>
+
+ <sect2>
+ <title>Creating the Static Network Interface Configuration Files</title>
+
+ <para>Which interfaces are brought up and down by the network script
+ depends on the files and directories in the <filename
+ class="directory">/etc/sysconfig</filename> hierarchy.
+ This directory should contain a sub-directory for each interface to be
+ configured, such as <filename>ifconfig.xyz</filename>, where
+ <quote>xyz</quote> is a network interface name. Inside this directory
+ would be files defining the attributes to this interface, such as its IP
+ address(es), subnet masks, and so forth.</para>
+
+ <note><para>Udev may assign random Network Card Interface names
+ for some network cards such as enp2s1. If you are not sure what
+ your Network Card Interface name is, you can always run
+ <command>ip l</command> after you have booted your system. Again,
+ it is important that <filename>ifconfig.xyz</filename> is named
+ after correct Network Card Interface name (e.g.
+ <filename>ifconfig.enp2s1</filename> or
+ <filename>ifconfig.eth0</filename>) or Systemd will fail to bring
+ up your network interface.</para></note>
+
+ <para>The following command creates a sample <filename>ipv4</filename>
+ file for the <emphasis>eth0</emphasis> device:</para>
+
+<screen><userinput>mkdir -pv /etc/sysconfig &&
+cd /etc/sysconfig &&
+cat > ifconfig.eth0 << "EOF"
+<literal>IFACE="eth0"
+SERVICE="ipv4-static"
+IP="192.168.1.1"
+GATEWAY="192.168.1.2"
+PREFIX="24"
+BROADCAST="192.168.1.255"</literal>
+EOF</userinput></screen>
+
+ <para os="var-ob">The values of these variables must be changed in every
+ file to match the proper setup.</para>
+
+ <para os="var-i">The <envar>IFACE</envar> variable defines the interface
+ name, for example, eth0. It is required for all network device configuration
+ files.</para>
+
+ <para os="var-s">The <envar>SERVICE</envar> variable defines the method used
+ for obtaining the IP address. The CLFS-Network-Scripts package has a modular
+ IP assignment format, and creating additional files in the <filename
+ class="directory">/lib/services</filename>
+ 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
+ variable entirely.</para>
+
+ <para>The <envar>PREFIX</envar> variable needs to contain the number of
+ bits used in the subnet. Each octet in an IP address is 8 bits. If the
+ subnet's netmask is 255.255.255.0, then it is using the first three octets
+ (24 bits) to specify the network number. If the netmask is 255.255.255.240,
+ it would be using the first 28 bits. Prefixes longer than 24 bits are
+ commonly used by DSL and cable-based Internet Service Providers (ISPs).
+ In this example (PREFIX=24), the netmask is 255.255.255.0. Adjust the
+ <envar>PREFIX</envar> variable according to your specific subnet.</para>
+
+ <para>For more information see the <command>ifup</command> man page.</para>
+
+ <para>To configure another DHCP Interface, Follow <xref linkend="ch-network-dhcpcd"/>.</para>
+
+ </sect2>
+
+ <sect2>
+ <title>Configuring the Network Interface at boot</title>
+
+ <para>Enabling of the Network Interface configuration is
+ done per interface. To enable Network Interface
+ configuration at boot, run:</para>
+
+<screen role="nodump"><userinput>systemctl enable ifupdown at eth0</userinput></screen>
+
+ <para>To disable previously enabled Network Interface
+ configuration at boot, run:</para>
+
+<screen role="nodump"><userinput>systemctl disable ifupdown at eth0</userinput></screen>
+
+ <para>To manually start the Network Interface configuration,
+ run:</para>
+
+<screen role="nodump"><userinput>systemctl start ifupdown at eth0</userinput></screen>
+
+ <para>Replace eth0 with the correct Network Interface
+ name as described on the beginning of this page.</para>
+
+ </sect2>
+
+</sect1>
diff --git a/BOOK/network/common/systemd-network.xml b/BOOK/network/common/systemd-network.xml
index e69de29..91f8e83 100644
--- a/BOOK/network/common/systemd-network.xml
+++ b/BOOK/network/common/systemd-network.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-systemd-network">
+ <?dbhtml filename="systemd-network.html"?>
+
+ <title>Networking Configuration with Systemd-networkd</title>
+
+ <sect2 role="static">
+ <title>Creating the Static Network Interface Configuration Files</title>
+
+ <note><para>Udev may assign random Network Card Interface names
+ for some network cards such as enp2s1. If you are not sure what
+ your Network Card Interface name is, you can always run
+ <command>ip l</command> after you have booted your system. It is important that the <envar>Name</envar> variable in <filename>/etc/systemd/network</filename> contain the correct Network Card Interface name (e.g.
+ <envar>Name=enp2s1</envar> or
+ <envar>Name=eth0</envar>) or Systemd will fail to bring
+ up your network interface.</para></note>
+
+ <para><command>systemd-networkd</command> uses <filename>/etc/system/network</filename> for configuration files. Refer to systemd.network(5) and systemd.netdev(5). Configure a network interface with a config file. Adjust Name= as required:</para>
+
+<screen><userinput>cd /etc/systemd/network &&
+cat > static.network << "EOF"
+[Match]
+Name=enp2s0
+
+[Network]
+Address=192.168.1.1/24
+Gateway=192.168.1.2
+EOF</userinput></screen>
+
+ <para os="var-ob">The values of these variables must be changed in every
+ file to match the proper setup.</para>
+
+ <para os="var-i">The <envar>Name</envar> variable defines the interface
+ name, for example, eth0. It is required for all network device configuration
+ files.</para>
+
+ <para>The <envar>Gateway</envar> variable should contain the default
+ gateway IP address, if one is present. If not, then comment out the
+ variable entirely.</para>
+
+ <para>For more information see the <command>systemd.netdev</command> man page.</para>
+
+ </sect2>
+
+ <sect2 role="dhcp">
+ <title>Connecting to a network with DHCP</title>
+
+ <para><command>systemd-networkd</command> uses <filename>/etc/systemd/network</filename> for configuration files. Refer to <filename>systemd.network(5)</filename> and <filename>systemd.netdev(5)</filename>. Configure a network interface with a config file. Adjust Name= as required:</para>
+
+<screen><userinput>cd /etc/systemd/network &&
+cat > dhcp.network << "EOF"
+[Match]
+Name=enp2s0
+
+[Network]
+DHCP=yes
+EOF</userinput></screen>
+
+ <para><command>systemd-networkd</command> will automatically configure <filename>/run/systemd/network/resolv.conf</filename> when using DHCP. If you did not manually create <filename>/etc/resolv.conf</filename>, create a symlink:</para>
+
+<screen><userinput>ln -sv /run/systemd/network/resolv.conf /etc</userinput></screen>
+
+ </sect2>
+
+</sect1>
diff --git a/BOOK/network/mips-chapter.xml b/BOOK/network/mips-chapter.xml
index 7d28e07..9021963 100644
--- a/BOOK/network/mips-chapter.xml
+++ b/BOOK/network/mips-chapter.xml
@@ -14,10 +14,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
</chapter>
diff --git a/BOOK/network/mips64-64-chapter.xml b/BOOK/network/mips64-64-chapter.xml
index 7d28e07..9021963 100644
--- a/BOOK/network/mips64-64-chapter.xml
+++ b/BOOK/network/mips64-64-chapter.xml
@@ -14,10 +14,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
</chapter>
diff --git a/BOOK/network/mips64-chapter.xml b/BOOK/network/mips64-chapter.xml
index f373fbc..25baa60 100644
--- a/BOOK/network/mips64-chapter.xml
+++ b/BOOK/network/mips64-chapter.xml
@@ -14,10 +14,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
</chapter>
diff --git a/BOOK/network/multilib/dhcpcd.xml b/BOOK/network/multilib/dhcpcd.xml
index 4c2a146..ea981d7 100644
--- a/BOOK/network/multilib/dhcpcd.xml
+++ b/BOOK/network/multilib/dhcpcd.xml
@@ -57,6 +57,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/dhcpcd.xml"
+ xpointer="xpointer(id('conf-dhcpcd'))"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/dhcpcd.xml"
xpointer="xpointer(id('contents-dhcpcd'))"/>
</sect1>
diff --git a/BOOK/network/ppc-chapter.xml b/BOOK/network/ppc-chapter.xml
index 7d28e07..9021963 100644
--- a/BOOK/network/ppc-chapter.xml
+++ b/BOOK/network/ppc-chapter.xml
@@ -14,10 +14,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
</chapter>
diff --git a/BOOK/network/ppc64-64-chapter.xml b/BOOK/network/ppc64-64-chapter.xml
index 7d28e07..9021963 100644
--- a/BOOK/network/ppc64-64-chapter.xml
+++ b/BOOK/network/ppc64-64-chapter.xml
@@ -14,10 +14,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
</chapter>
diff --git a/BOOK/network/ppc64-chapter.xml b/BOOK/network/ppc64-chapter.xml
index f373fbc..25baa60 100644
--- a/BOOK/network/ppc64-chapter.xml
+++ b/BOOK/network/ppc64-chapter.xml
@@ -14,10 +14,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
</chapter>
diff --git a/BOOK/network/sparc-chapter.xml b/BOOK/network/sparc-chapter.xml
index 7d28e07..9021963 100644
--- a/BOOK/network/sparc-chapter.xml
+++ b/BOOK/network/sparc-chapter.xml
@@ -14,10 +14,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
</chapter>
diff --git a/BOOK/network/sparc64-64-chapter.xml b/BOOK/network/sparc64-64-chapter.xml
index 7d28e07..9021963 100644
--- a/BOOK/network/sparc64-64-chapter.xml
+++ b/BOOK/network/sparc64-64-chapter.xml
@@ -14,10 +14,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
</chapter>
diff --git a/BOOK/network/sparc64-chapter.xml b/BOOK/network/sparc64-chapter.xml
index f373fbc..25baa60 100644
--- a/BOOK/network/sparc64-chapter.xml
+++ b/BOOK/network/sparc64-chapter.xml
@@ -14,10 +14,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
</chapter>
diff --git a/BOOK/network/x86-chapter.xml b/BOOK/network/x86-chapter.xml
index 7d28e07..9021963 100644
--- a/BOOK/network/x86-chapter.xml
+++ b/BOOK/network/x86-chapter.xml
@@ -14,10 +14,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
</chapter>
diff --git a/BOOK/network/x86_64-64-chapter.xml b/BOOK/network/x86_64-64-chapter.xml
index 7d28e07..9021963 100644
--- a/BOOK/network/x86_64-64-chapter.xml
+++ b/BOOK/network/x86_64-64-chapter.xml
@@ -14,10 +14,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
</chapter>
diff --git a/BOOK/network/x86_64-chapter.xml b/BOOK/network/x86_64-chapter.xml
index f373fbc..25baa60 100644
--- a/BOOK/network/x86_64-chapter.xml
+++ b/BOOK/network/x86_64-chapter.xml
@@ -14,10 +14,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcp.xml"/>
</chapter>
-----------------------------------------------------------------------
Summary of changes:
BOOK/introduction/common/changelog.xml | 4 +
BOOK/network/alpha-chapter.xml | 6 +-
BOOK/network/common/choose.xml | 6 +-
BOOK/network/common/dhcp.xml | 65 ------------------
BOOK/network/common/dhcpcd.xml | 52 ++++++++++++++
BOOK/network/common/static.xml | 105 -----------------------------
BOOK/network/common/sysconfig-network.xml | 105 +++++++++++++++++++++++++++++
BOOK/network/common/systemd-network.xml | 71 +++++++++++++++++++
BOOK/network/mips-chapter.xml | 6 +-
BOOK/network/mips64-64-chapter.xml | 6 +-
BOOK/network/mips64-chapter.xml | 6 +-
BOOK/network/multilib/dhcpcd.xml | 4 +
BOOK/network/ppc-chapter.xml | 6 +-
BOOK/network/ppc64-64-chapter.xml | 6 +-
BOOK/network/ppc64-chapter.xml | 6 +-
BOOK/network/sparc-chapter.xml | 6 +-
BOOK/network/sparc64-64-chapter.xml | 6 +-
BOOK/network/sparc64-chapter.xml | 6 +-
BOOK/network/x86-chapter.xml | 6 +-
BOOK/network/x86_64-64-chapter.xml | 6 +-
BOOK/network/x86_64-chapter.xml | 6 +-
21 files changed, 278 insertions(+), 212 deletions(-)
delete mode 100644 BOOK/network/common/dhcp.xml
delete mode 100644 BOOK/network/common/static.xml
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list