From e375ceb6409d2cccee82f0be05b0fa906bf25fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 17 Nov 2020 10:43:13 +0100 Subject: [PATCH 1/5] man/systemd.netdev: don't say "ranges" --- man/systemd.netdev.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index e6a96e3a15..6420488162 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -754,7 +754,8 @@ Id= - Specifies the Virtual Network Identifier (VNI) to use. Ranges [0-16777215]. This field is mandatory. + Specifies the Virtual Network Identifier (VNI) to use, a number between 0 and 16777215. This + field is mandatory. @@ -766,7 +767,7 @@ TOS= - Specifies the TOS value to use in outgoing packets. Ranges [1-255]. + Specifies the TOS value to use in outgoing packets. Takes a number between 1 and 255. From 7ad41997d19a626c5f0dbad72ec1f37d4bb2e2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 17 Nov 2020 10:55:12 +0100 Subject: [PATCH 2/5] man/systemd.netdev: remove bogus markup There is no "Multicast" constant, and NULL doesn't make sense in the context of addresses. --- man/systemd.netdev.xml | 4 ++-- src/network/netdev/bond.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 6420488162..848ed8ec40 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -1771,8 +1771,8 @@ AdActorSystem= - Specifies the 802.3ad system mac address. This can not be either - NULL or Multicast. + Specifies the 802.3ad system MAC address. This cannot be a null or multicast address. + diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c index 8c777b3a06..e27f36067b 100644 --- a/src/network/netdev/bond.c +++ b/src/network/netdev/bond.c @@ -469,7 +469,7 @@ int config_parse_ad_actor_system( } if (ether_addr_is_null(&n) || (n.ether_addr_octet[0] & 0x01)) { log_syntax(unit, LOG_WARNING, filename, line, 0, - "Not a valid MAC address %s, can not be null or multicast. Ignoring assignment.", + "Not an appropriate MAC address %s, cannot be null or multicast. Ignoring assignment.", rvalue); return 0; } From dbc29e9175a2314465d0ca460584446e0c6ce0d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 17 Nov 2020 10:55:36 +0100 Subject: [PATCH 3/5] network: use the common "cannot" form Just for consistency. --- src/network/netdev/netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index ba9039006b..9f390b5781 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -649,7 +649,7 @@ int netdev_join(NetDev *netdev, Link *link, link_netlink_message_handler_t callb return r; break; default: - assert_not_reached("Can not join independent netdev"); + assert_not_reached("Cannot join independent netdev"); } return 0; From de70ff66dc628062d4f04270988b92ba0aef2420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 17 Nov 2020 11:46:50 +0100 Subject: [PATCH 4/5] man: drop misplaced phrase I think it was added in 6c2b9c8da1eb1bac7e8f170b913f63dbd13a16d7 as c&p. --- man/systemd.netdev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 848ed8ec40..fab5f0cdef 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -84,7 +84,7 @@ bond - A bond device is an aggregation of all its slave devices. See Linux Ethernet Bonding Driver HOWTO for details.Local configuration + A bond device is an aggregation of all its slave devices. See Linux Ethernet Bonding Driver HOWTO for details. bridge A bridge device is a software switch, and each of its slave devices and the bridge itself are ports of the switch. From 905a03e71dc00a47396344170592faaedc6c44f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 17 Nov 2020 11:53:10 +0100 Subject: [PATCH 5/5] NEWS,man: improve descriptions of Independent= In NEWS, the new option was described twice, most likely because the first description was tucked away in a paragraph about some other subject. While at it, improve the descriptions in the man page to make it easier to grok what that option really does. --- NEWS | 9 +++------ man/systemd.netdev.xml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index 5077a2faf8..0a92ca4010 100644 --- a/NEWS +++ b/NEWS @@ -457,9 +457,7 @@ CHANGES WITH 247 in spe: discipline in the [FlowQueuePIE] sections. * systemd-networkd's .netdev files may now be used to create "BareUDP" - tunnels, configured in the new [BareUDP] setting. VXLAN tunnels may - now be marked to be independent of any underlying network interface - via the new Independent= boolean setting. + tunnels, configured in the new [BareUDP] setting. * systemd-networkd's Gateway= setting in .network files now accepts the special values "_dhcp4" and "_ipv6ra" to configure additional, @@ -482,9 +480,8 @@ CHANGES WITH 247 in spe: prefix will be announced through IPv6 router advertisement (IPv6 RA). The setting is enabled by default. - * systemd-networkd's .netdev files gained the Independent= boolean - setting in [VXLAN] section. When enabled, the vxlan interface will be - created without underlying interfaces. Defaults to false. + * VXLAN tunnels may now be marked as independent of any underlying + network interface via the new Independent= boolean setting. * systemctl gained support for two new verbs: "service-log-level" and "service-log-target" may be used on services that implement the diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index fab5f0cdef..f8a5c6dc86 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -819,8 +819,9 @@ Independent= - Takes a boolean. When true, the vxlan interface is created without underlying interfaces. - Defaults to false. + Takes a boolean. When true, the vxlan interface is created without any underlying network + interface. Defaults to false, which means that a .network file that requests this tunnel using + Tunnel= is required for the tunnel to be created. @@ -1277,9 +1278,10 @@ Independent= - Takes a boolean. When true tunnel does not require .network file. Created as "tunnel@NONE". - Defaults to false. - + Takes a boolean. When false (the default), the tunnel is always created over some network + device, and a .network file that requests this tunnel using Tunnel= is required + for the tunnel to be created. When true, the tunnel is created independently of any network as + "tunnel@NONE". @@ -1949,10 +1951,8 @@ Independent= - Takes a boolean. If set to no, the xfrm interface should have an - underlying device which can be used for hardware offloading. Defaults to no. - See systemd.network5 - for how to configure the underlying device. + Takes a boolean. If false (the default), the xfrm interface must have an underlying device + which can be used for hardware offloading.