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 e6a96e3a15..f8a5c6dc86 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. @@ -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. @@ -818,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. @@ -1276,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". @@ -1770,8 +1773,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. + @@ -1948,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. 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; } 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;