networkd: clean up DUID code a bit

Let's move DUID configuration into the [DHCP] section, since it only makes
sense in a DHCP context, and should be close to the configuration of
ClientIdentifier= and suchlike.

This really shouldn't be a section of its own, we don't have any for any of our
other per-protocol specific identifiers...

Follow-up for #2890 #2943

1 files changed, 22 insertions, 37 deletions

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 9bf1b198ad..2a20748376 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -815,9 +815,8 @@
         <varlistentry>
           <term><varname>ClientIdentifier=</varname></term>
           <listitem>
-            <para>DHCP client identifier to use. Either <literal>mac</literal>
-            to use the MAC address of the link or <literal>duid</literal>
-            (the default) to use a RFC4361-compliant Client ID.</para>
+            <para>The DHCPv4 client identifier to use. Either <literal>mac</literal> to use the MAC address of the link
+            or <literal>duid</literal> (the default, see below) to use a RFC4361-compliant Client ID.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -828,6 +827,25 @@
           </listitem>
         </varlistentry>
         <varlistentry>
+          <term><varname>DUIDRawData=</varname></term>
+          <listitem><para>Specifies the DHCP DUID bytes as a single newline-terminated, hexadecimal string, with each
+          byte separated by a ':'.  A DHCPv6 client sends the DHCP Unique Identifier (DUID) and the interface Identity
+          Association Identifier (IAID) to a DHCP server when acquiring a dynamic IPv6 address. Similar, DHCPv4 clients
+          send the IAID and DUID to the DHCP server when acquiring a dynamic IPv4 address if
+          <option>ClientIdentifier=duid</option>. IAID and DUID allows a DHCP server to uniquely identify the machine
+          and the interface requesting a DHCP IP address.</para>
+
+          <para>The DUID value specified here takes precedence over the DUID that systemd-networkd generates
+          using the machine-id from the <filename>/etc/machine-id</filename> file, as well as the
+          global DUID that may be specified in <citerefentry><refentrytitle>networkd.conf
+          </refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+
+          <para>The configured DHCP DUID should conform to the specification in
+          <ulink url="http://tools.ietf.org/html/rfc3315#section-9">RFC 3315</ulink>,
+          <ulink url="http://tools.ietf.org/html/rfc6355">RFC 6355</ulink>.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
           <term><varname>RequestBroadcast=</varname></term>
           <listitem>
             <para>Request the server to use broadcast messages before
@@ -846,40 +864,7 @@
           </listitem>
         </varlistentry>
       </variablelist>
-
-  </refsect1>
-
-  <refsect1>
-    <title>[DUID] Section Options</title>
-
-    <para>This section configures the DHCP Unique Identifier (DUID) value used by DHCP
-    protocol. DHCPv6 client protocol sends the DHCP Unique Identifier and the interface
-    Identity Association Identifier (IAID) to a DHCP server when acquiring a dynamic IPv6
-    address. DHCPv4 client protocol sends IAID and DUID to the DHCP server when acquiring
-    a dynamic IPv4 address if <option>ClientIdentifier=duid</option>. IAID and DUID allows a
-    DHCP server to uniquely identify the machine and the interface requesting a DHCP IP.</para>
-
-    <para>The DUID value specified here overrides the DUID that systemd-networkd generates
-    using the machine-id from the <filename>/etc/machine-id</filename> file, as well as the
-    global DUID that may be specified in <citerefentry><refentrytitle>networkd.conf
-    </refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
-
-    <para>The configured DHCP DUID should conform to the specification in
-    <ulink url="http://tools.ietf.org/html/rfc3315#section-9">RFC 3315</ulink>,
-    <ulink url="http://tools.ietf.org/html/rfc6355">RFC 6355</ulink>.</para>
-
-    <para>The following options are available in <literal>[DUID]</literal> section:</para>
-
-    <variablelist class='network-directives'>
-
-      <varlistentry>
-        <term><varname>RawData=</varname></term>
-        <listitem><para>Specifies the DUID bytes as a single newline-terminated, hexadecimal
-        string, with each byte separated by a ':'.</para></listitem>
-      </varlistentry>
-
-    </variablelist>
-  </refsect1>
+    </refsect1>
 
   <refsect1>
     <title>[DHCPServer] Section Options</title>