From d05def163ea09bc2e617703546e5f9db95e27e5b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 6 May 2016 17:04:05 +0200 Subject: [PATCH 1/3] 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. --- man/systemd.network.xml | 13 +++++++------ src/network/networkd-network-gperf.gperf | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 3ee80a64a0..40e40b8308 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. - - IAID= - - Identity Association Identifier for the interface, a 32-bit unsigned integer. - - Note that an interface without any static IPv6 addresses configured, and neither @@ -867,6 +861,13 @@ + + IAID= + + The DHCP Identity Association Identifier (IAID) for the interface, a 32-bit unsigned integer. + + + RequestBroadcast= diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 51e750b299..a9a541559e 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) From 82ecb4c3ecaa1f62163ad7cdd6de5b1623bc6507 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 6 May 2016 17:07:41 +0200 Subject: [PATCH 2/3] man: move IPv6 note to the right section Make the XML validate again. --- man/systemd.network.xml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 40e40b8308..866a5bf7ae 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -79,6 +79,11 @@ needed. As a special case, an empty file (file size 0) or symlink with the same name pointing to /dev/null disables the configuration file entirely (it is "masked"). + + 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 /proc/sys/net/ipv6/conf/ifname/disable_ipv6. + @@ -206,15 +211,6 @@ below 1280 (the minimum MTU for IPv6) it will automatically be increased to this value. - - - 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 - /proc/sys/net/ipv6/conf/ifname/disable_ipv6. - - - From 2ef322fc40d65b1df91a0f0409994bb9748b959e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 6 May 2016 17:08:03 +0200 Subject: [PATCH 3/3] man: link the part about [DHCP] to the DHCP= explanation --- man/systemd.network.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 866a5bf7ae..6d45d6c807 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -244,6 +244,9 @@ Furthermore, note that by default the domain name specified through DHCP is not used for name resolution. See option below. + + See the [DHCP] section below for further configuration options for the DHCP client + support.