SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3205 from poettering/iaid

Browse Source 
more dhcp fixes
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2016-05-07 15:31:58 -04:00
parent 74ad38ff0e 2ef322fc40
commit 03a037f338
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/systemd.network.xml
+15 -15
View File
@@ -79,6 +79,11 @@
needed. As a special case, an empty file (file size 0) or symlink
with the same name pointing to <filename>/dev/null</filename>
disables the configuration file entirely (it is "masked").</para>
<para>Note that an interface without any static IPv6 addresses configured, and neither DHCPv6 nor IPv6LL enabled,
shall be considered to have no IPv6 support. IPv6 will be automatically disabled for that interface by writing "1"
to <filename>/proc/sys/net/ipv6/conf/<replaceable>ifname</replaceable>/disable_ipv6</filename>.
</para>
</refsect1>
<refsect1>
@@ -206,21 +211,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
DHCPv6 nor IPv6LL enabled, shall be considered to have no IPv6 support. IPv6 will be
automatically disabled for that interface by writing "1" to
<filename>/proc/sys/net/ipv6/conf/<replaceable>ifname</replaceable>/disable_ipv6</filename>.
</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
@@ -254,6 +244,9 @@
<para>Furthermore, note that by default the domain name
specified through DHCP is not used for name resolution.
See option <option>UseDomains=</option> below.</para>
<para>See the <literal>[DHCP]</literal> section below for further configuration options for the DHCP client
support.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -867,6 +860,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>
src/network/networkd-network-gperf.gperf
+1 -1
View File
@@ -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)