diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 487bb2ab3f..24deb0d1d7 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -240,7 +240,7 @@
By enabling DHCPv6 support explicitly, the DHCPv6 client will
be started regardless of the presence of routers on the link,
or what flags the routers pass. See
- IPv6AcceptRouterAdvertisements=.
+ IPv6AcceptRA=.
Furthermore, note that by default the domain name
specified through DHCP is not used for name resolution.
@@ -527,7 +527,7 @@
no.
- IPv6AcceptRouterAdvertisements=
+ IPv6AcceptRA=
Enable or disable IPv6 Router Advertisement (RA) reception support for the interface. Takes
a boolean parameter. If true, RAs are accepted; if false, RAs are ignored, independently of the local
forwarding state. When not set, the kernel default is used, and RAs are accepted only when local forwarding
@@ -535,7 +535,7 @@
the relevant flags are set in the RA data, or if no routers are found on the link.
Further settings for the IPv6 RA support may be configured in the
- [IPv6AcceptRouterAdvertisements] section, see below.
+ [IPv6AcceptRA] section, see below.
Also see ip-sysctl.txt in the kernel
@@ -895,9 +895,9 @@
- [IPv6AcceptRouterAdvertisements] Section Options
- The [IPv6AcceptRouterAdvertisements] section configures the IPv6 Router Advertisement
- (RA) client, if it is enabled with the IPv6AcceptRouterAdvertisements= setting described
+ [IPv6AcceptRA] Section Options
+ The [IPv6AcceptRA] section configures the IPv6 Router Advertisement
+ (RA) client, if it is enabled with the IPv6AcceptRA= setting described
above:
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index c722db55c7..d9f5b95cdf 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -55,6 +55,8 @@ Network.NTP, config_parse_strv,
Network.IPForward, config_parse_address_family_boolean_with_kernel,0, offsetof(Network, ip_forward)
Network.IPMasquerade, config_parse_bool, 0, offsetof(Network, ip_masquerade)
Network.IPv6PrivacyExtensions, config_parse_ipv6_privacy_extensions, 0, offsetof(Network, ipv6_privacy_extensions)
+Network.IPv6AcceptRA, config_parse_tristate, 0, offsetof(Network, ipv6_accept_ra)
+/* legacy alias for the above */
Network.IPv6AcceptRouterAdvertisements, config_parse_tristate, 0, offsetof(Network, ipv6_accept_ra)
Network.IPv6DuplicateAddressDetection, config_parse_int, 0, offsetof(Network, ipv6_dad_transmits)
Network.IPv6HopLimit, config_parse_int, 0, offsetof(Network, ipv6_hop_limit)
@@ -89,8 +91,8 @@ DHCP.DUIDRawData, config_parse_duid_rawdata,
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)
-IPv6AcceptRouterAdvertisements.UseDNS config_parse_bool, 0, offsetof(Network, ipv6_accept_ra_use_dns)
-IPv6AcceptRouterAdvertisements.UseDomains config_parse_dhcp_use_domains, 0, offsetof(Network, ipv6_accept_ra_use_domains)
+IPv6AcceptRA.UseDNS, config_parse_bool, 0, offsetof(Network, ipv6_accept_ra_use_dns)
+IPv6AcceptRA.UseDomains, config_parse_dhcp_use_domains, 0, offsetof(Network, ipv6_accept_ra_use_domains)
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)
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index e961db60a7..c03c0f0bed 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -145,6 +145,7 @@ static int network_load_one(Manager *manager, const char *filename) {
"DHCP\0"
"DHCPv4\0" /* compat */
"DHCPServer\0"
+ "IPv6AcceptRA\0"
"Bridge\0"
"BridgeFDB\0",
config_item_perf_lookup, network_network_gperf_lookup,
diff --git a/test/networkd-test.py b/test/networkd-test.py
index f94224cce2..78da0a213a 100755
--- a/test/networkd-test.py
+++ b/test/networkd-test.py
@@ -205,7 +205,7 @@ DHCP=%s
def test_coldplug_dhcp_yes_ip4_no_ra(self):
# with disabling RA explicitly things should be fast
self.do_test(coldplug=True, ipv6=False,
- extra_opts='IPv6AcceptRouterAdvertisements=False')
+ extra_opts='IPv6AcceptRA=False')
def test_coldplug_dhcp_ip4_only(self):
# we have a 12s timeout on RA, so we need to wait longer
@@ -215,7 +215,7 @@ DHCP=%s
def test_coldplug_dhcp_ip4_only_no_ra(self):
# with disabling RA explicitly things should be fast
self.do_test(coldplug=True, ipv6=False, dhcp_mode='ipv4',
- extra_opts='IPv6AcceptRouterAdvertisements=False')
+ extra_opts='IPv6AcceptRA=False')
def test_coldplug_dhcp_ip6(self):
self.do_test(coldplug=True, ipv6=True)