From: Sebastian Pucilowski Date: Thu, 31 Mar 2022 05:31:28 +0000 (+1100) Subject: Fix "link-local" language inconsistencies X-Git-Tag: v251-rc2~241 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f81ac115dc1b2688756ffc78599ce98f31c57195;p=thirdparty%2Fsystemd.git Fix "link-local" language inconsistencies "Link-local" and "link local" are used throughout man pages and program output, with the former used far more than the latter. This commit makes it consistent throughout the project. --- diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 8c984c5b228..e090c5592ec 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -366,7 +366,7 @@ IPv6LinkLocalAddressGenerationMode= - Specifies how IPv6 link local address is generated. Takes one of + Specifies how IPv6 link-local address is generated. Takes one of eui64, none, stable-privacy and random. When unset, stable-privacy is used if IPv6StableSecretAddress= is specified, and if not, @@ -715,7 +715,7 @@ Table=1234 may trigger the start of the DHCPv6 client if the relevant flags are set in the RA data, or if no routers are found on the link. The default is to disable RA reception for bridge devices or when IP forwarding is enabled, and to enable it otherwise. Cannot be enabled on - bond devices and when link local addressing is disabled. + bond devices and when link-local addressing is disabled. Further settings for the IPv6 RA support may be configured in the [IPv6AcceptRA] section, see below. @@ -2836,7 +2836,7 @@ Token=prefixstable:2002:da8:1:: DNS= specifies a list of recursive DNS server IPv6 addresses that are distributed via Router Advertisement messages when EmitDNS= is true. DNS= also takes special value _link_local; in that case - the IPv6 link local address is distributed. If DNS= is empty, DNS servers are + the IPv6 link-local address is distributed. If DNS= is empty, DNS servers are read from the [Network] section. If the [Network] section does not contain any DNS servers either, DNS servers from the uplink interface specified in UplinkInterface= will be used. When EmitDNS= is false, no DNS server information is sent in diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c index f825c8b1857..43c8ca42fef 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -91,7 +91,7 @@ void network_adjust_dhcp(Network *network) { if (!FLAGS_SET(network->link_local, ADDRESS_FAMILY_IPV6) && FLAGS_SET(network->dhcp, ADDRESS_FAMILY_IPV6)) { - log_warning("%s: DHCPv6 client is enabled but IPv6 link local addressing is disabled. " + log_warning("%s: DHCPv6 client is enabled but IPv6 link-local addressing is disabled. " "Disabling DHCPv6 client.", network->filename); SET_FLAG(network->dhcp, ADDRESS_FAMILY_IPV6, false); } diff --git a/src/network/networkd-ipv6ll.c b/src/network/networkd-ipv6ll.c index 79cf679daf5..dc09171afee 100644 --- a/src/network/networkd-ipv6ll.c +++ b/src/network/networkd-ipv6ll.c @@ -245,4 +245,4 @@ DEFINE_CONFIG_PARSE_ENUM( config_parse_ipv6_link_local_address_gen_mode, ipv6_link_local_address_gen_mode, IPv6LinkLocalAddressGenMode, - "Failed to parse IPv6 link local address generation mode"); + "Failed to parse IPv6 link-local address generation mode"); diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index 733ac128efb..d6740010424 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.h @@ -69,7 +69,7 @@ typedef struct Link { sd_device *sd_device; char *driver; - /* link local addressing */ + /* link-local addressing */ IPv6LinkLocalAddressGenMode ipv6ll_address_gen_mode; /* wlan */ diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index 3078f82a44c..8bb4477a2f6 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -59,7 +59,7 @@ void network_adjust_ipv6_accept_ra(Network *network) { if (!FLAGS_SET(network->link_local, ADDRESS_FAMILY_IPV6)) { if (network->ipv6_accept_ra > 0) - log_warning("%s: IPv6AcceptRA= is enabled but IPv6 link local addressing is disabled or not supported. " + log_warning("%s: IPv6AcceptRA= is enabled but IPv6 link-local addressing is disabled or not supported. " "Disabling IPv6AcceptRA=.", network->filename); network->ipv6_accept_ra = false; } diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index 807e0fadc66..98e6159040e 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -204,7 +204,7 @@ struct Network { char *dhcp_server_boot_server_name; char *dhcp_server_boot_filename; - /* link local addressing support */ + /* link-local addressing support */ AddressFamily link_local; IPv6LinkLocalAddressGenMode ipv6ll_address_gen_mode; struct in6_addr ipv6ll_stable_secret; diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c index b9f5c55f4c5..7fc1306d199 100644 --- a/src/network/networkd-radv.c +++ b/src/network/networkd-radv.c @@ -33,7 +33,7 @@ void network_adjust_radv(Network *network) { if (!FLAGS_SET(network->link_local, ADDRESS_FAMILY_IPV6)) { if (network->router_prefix_delegation != RADV_PREFIX_DELEGATION_NONE) - log_warning("%s: IPv6PrefixDelegation= is enabled but IPv6 link local addressing is disabled. " + log_warning("%s: IPv6PrefixDelegation= is enabled but IPv6 link-local addressing is disabled. " "Disabling IPv6PrefixDelegation=.", network->filename); network->router_prefix_delegation = RADV_PREFIX_DELEGATION_NONE; diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c index 4e4b285f087..68d55ed84d2 100644 --- a/src/network/networkd-sysctl.c +++ b/src/network/networkd-sysctl.c @@ -284,7 +284,7 @@ int link_set_sysctl(Link *link) { r = link_set_ipv6ll_stable_secret(link); if (r < 0) - log_link_warning_errno(link, r, "Cannot set stable secret address for IPv6 link local address: %m"); + log_link_warning_errno(link, r, "Cannot set stable secret address for IPv6 link-local address: %m"); r = link_set_ipv4_accept_local(link); if (r < 0)