From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 6 May 2016 15:04:05 +0000 (+0200)
Subject: networkd: move the IAID configuration option into the [DHCP] section
X-Git-Tag: v230~68^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d05def163ea09bc2e617703546e5f9db95e27e5b;p=thirdparty%2Fsystemd.git

networkd: move the IAID configuration option into the [DHCP] section

It's only relevant to DHCP, and it should be where the DUID is configured too.
---

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 3ee80a64a06..40e40b83086 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -206,12 +206,6 @@
           below 1280 (the minimum MTU for IPv6) it will automatically be increased to this value.</para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><varname>IAID=</varname></term>
-        <listitem>
-          <para>Identity Association Identifier for the interface, a 32-bit unsigned integer.</para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
       <listitem>
         <para>Note that an interface without any static IPv6 addresses configured, and neither
@@ -867,6 +861,13 @@
           </listitem>
         </varlistentry>
 
+        <varlistentry>
+          <term><varname>IAID=</varname></term>
+          <listitem>
+            <para>The DHCP Identity Association Identifier (IAID) for the interface, a 32-bit unsigned integer.</para>
+          </listitem>
+        </varlistentry>
+
         <varlistentry>
           <term><varname>RequestBroadcast=</varname></term>
           <listitem>
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 51e750b299a..a9a541559e2 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -27,7 +27,6 @@ Match.KernelCommandLine,                config_parse_net_condition,
 Match.Architecture,                     config_parse_net_condition,                     CONDITION_ARCHITECTURE,        offsetof(Network, match_arch)
 Link.MACAddress,                        config_parse_hwaddr,                            0,                             offsetof(Network, mac)
 Link.MTUBytes,                          config_parse_iec_size,                          0,                             offsetof(Network, mtu)
-Link.IAID,                              config_parse_iaid,                              0,                             offsetof(Network, iaid)
 Network.Description,                    config_parse_string,                            0,                             offsetof(Network, description)
 Network.Bridge,                         config_parse_netdev,                            0,                             offsetof(Network, bridge)
 Network.Bond,                           config_parse_netdev,                            0,                             offsetof(Network, bond)
@@ -89,6 +88,7 @@ DHCP.DUIDType,                          config_parse_duid_type,
 DHCP.DUIDRawData,                       config_parse_duid_rawdata,                      0,                             offsetof(Network, duid)
 DHCP.RouteMetric,                       config_parse_unsigned,                          0,                             offsetof(Network, dhcp_route_metric)
 DHCP.UseTimezone,                       config_parse_bool,                              0,                             offsetof(Network, dhcp_use_timezone)
+DHCP.IAID,                              config_parse_iaid,                              0,                             offsetof(Network, iaid)
 DHCPServer.MaxLeaseTimeSec,             config_parse_sec,                               0,                             offsetof(Network, dhcp_server_max_lease_time_usec)
 DHCPServer.DefaultLeaseTimeSec,         config_parse_sec,                               0,                             offsetof(Network, dhcp_server_default_lease_time_usec)
 DHCPServer.EmitDNS,                     config_parse_bool,                              0,                             offsetof(Network, dhcp_server_emit_dns)