Changeset d49cae5 for networking/connect

Timestamp:

07/20/2014 01:41:38 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

abf6e26b

Parents:

e39afa06

Message:

More systemd integration.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13502 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

networking/connect

Files:

• connect.xml (modified) (1 diff)
• dhcp-systemd.xml (moved) (moved from networking/connect/dhcp.xml ) (3 diffs)

networking/connect/connect.xml

@@ -34 +34 @@
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppp.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcpcd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhcp-systemd.xml"/>
 
 </chapter>

networking/connect/dhcp-systemd.xml

@@ -261 +261 @@
 <screen role="root"><userinput>dhclient <replaceable>&lt;eth0&gt;</replaceable></userinput></screen>
 
-      <para>
-        Replace <replaceable>&lt;eth0&gt;</replaceable> with your
-        desired interface. If you want more verbose output, add the
-        <command>-v</command> parameter to the command above.
-      </para>
-
-      <para id="dhclient-service">
-        If you want to configure network interfaces at boot using
-        <command>dhclient</command>, you need to install the
-        <filename>/lib/services/dhclient</filename> script
-        included in <xref linkend="bootscripts"/> package:
-      </para>
-
-<screen role="root"><userinput>make install-service-dhclient</userinput></screen>
-
-      <indexterm zone="dhcp dhclient-service">
-        <primary sortas="f-dhclient">dhclient (service script)</primary>
-      </indexterm>
-
-      <para id="dhclient-ifconfig">
-        Next, create the <filename>/etc/sysconfig/ifconfig.eth0</filename>
-        configuration file with the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/ifconfig.eth0 &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-IFACE="eth0"
-SERVICE="dhclient"
-DHCP_START=""
-DHCP_STOP=""
-
-# Set PRINTIP="yes" to have the script print
-# the DHCP assigned IP address
-PRINTIP="no"
-
-# Set PRINTALL="yes" to print the DHCP assigned values for
-# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
-PRINTALL="no"</literal>
-EOF</userinput></screen>
-
-      <indexterm zone="dhcp dhclient-ifconfig">
-        <primary sortas="e-etc-sysconfig-...-dhclient">/etc/sysconfig/ifconfig.eth0</primary>
-      </indexterm>
-
-      <para>
-        Adjust the file to suit your needs.
-      </para>
-
-      <para>
-        For more information on the appropriate <envar>DHCP_START</envar>
-        and <envar>DHCP_STOP</envar> values see
-        <command>man 8 dhclient</command>.
-      </para>
-
     </sect3>
 
@@ -370 +315 @@
 <screen role="root"><userinput>install -v -dm 755 /var/lib/dhcpd</userinput></screen>
 
-       <para>
-        If you want to start the DHCP Server at boot, install
-        the <filename>/etc/rc.d/init.d/dhcpd</filename>
-        init script included in the <xref linkend="bootscripts"/>
-        package:
+      <para>
+        To start the <command>dhcpd</command> daemon at boot,
+        install the systemd unit from the <xref linkend="bootscripts"/>
+        package by running the following command as the
+        <systemitem class="username">root</systemitem> user:
       </para>
 
@@ -385 +330 @@
       <para>
         You will need to edit the
-        <filename>/etc/sysconfig/dhcpd</filename> in order
+        <filename>/etc/default/dhcpd</filename> file in order
         to set the interface on which <command>dhcpd</command>
         will serve the DHCP requests.