From 85bc4c080d8264c7d7e233c9e0f304c8d650f126 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 10 Jun 2021 04:41:08 +0900 Subject: [PATCH 1/3] man: merge several settings about netdev --- man/systemd.network.xml | 75 ++++++----------------------------------- 1 file changed, 10 insertions(+), 65 deletions(-) diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 8a6211429d..d9a415bd4e 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -902,73 +902,27 @@ IPv6Token=prefixstable:2002:da8:1:: - Bridge= - - The name of the bridge to add the link to. See - systemd.netdev5. - - - - + BatmanAdvanced= Bond= - - The name of the bond to add the link to. See - systemd.netdev5. - - - - + Bridge= VRF= - The name of the VRF to add the link to. See + The name of the B.A.T.M.A.N. Advanced, bond, bridge, or VRF interface to add the link + to. See systemd.netdev5. - - VLAN= - - The name of a VLAN to create on the link. See - systemd.netdev5. - This option may be specified more than once. - - IPVLAN= - - The name of a IPVLAN to create on the link. See - systemd.netdev5. - This option may be specified more than once. - - - + MACsec= MACVLAN= - - The name of a MACVLAN to create on the link. See - systemd.netdev5. - This option may be specified more than once. - - - + Tunnel= + VLAN= VXLAN= - The name of a VXLAN to create on the link. See - systemd.netdev5. - This option may be specified more than once. - - - - Tunnel= - - The name of a Tunnel to create on the link. See - systemd.netdev5. - This option may be specified more than once. - - - - MACsec= - - The name of a MACsec device to create on the link. See + The name of a IPVLAN, MACsec, MACVLAN, tunnel, VLAN, or VXLAN to be created on the + link. See systemd.netdev5. This option may be specified more than once. @@ -1045,16 +999,7 @@ IPv6Token=prefixstable:2002:da8:1:: - - BatmanAdvanced= - - The name of the B.A.T.M.A.N. Advanced interface to add the link to. See - systemd.netdev5. - - - - - + From b9a4bc7070addbc97bc3970af2efeb79539d81f4 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 10 Jun 2021 04:43:35 +0900 Subject: [PATCH 2/3] network: sort settings about netdev --- src/network/networkd-network-gperf.gperf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 8601012123..e3ced5a45c 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -80,19 +80,19 @@ SR-IOV.LinkState, config_parse_sr_iov_link_state, SR-IOV.MACAddress, config_parse_sr_iov_mac, 0, 0 Network.Description, config_parse_string, 0, offsetof(Network, description) Network.BatmanAdvanced, config_parse_ifname, 0, offsetof(Network, batadv_name) -Network.Bridge, config_parse_ifname, 0, offsetof(Network, bridge_name) Network.Bond, config_parse_ifname, 0, offsetof(Network, bond_name) -Network.VLAN, config_parse_stacked_netdev, NETDEV_KIND_VLAN, offsetof(Network, stacked_netdev_names) -Network.MACVLAN, config_parse_stacked_netdev, NETDEV_KIND_MACVLAN, offsetof(Network, stacked_netdev_names) -Network.MACVTAP, config_parse_stacked_netdev, NETDEV_KIND_MACVTAP, offsetof(Network, stacked_netdev_names) +Network.Bridge, config_parse_ifname, 0, offsetof(Network, bridge_name) +Network.VRF, config_parse_ifname, 0, offsetof(Network, vrf_name) Network.IPVLAN, config_parse_stacked_netdev, NETDEV_KIND_IPVLAN, offsetof(Network, stacked_netdev_names) Network.IPVTAP, config_parse_stacked_netdev, NETDEV_KIND_IPVTAP, offsetof(Network, stacked_netdev_names) -Network.VXLAN, config_parse_stacked_netdev, NETDEV_KIND_VXLAN, offsetof(Network, stacked_netdev_names) Network.L2TP, config_parse_stacked_netdev, NETDEV_KIND_L2TP, offsetof(Network, stacked_netdev_names) Network.MACsec, config_parse_stacked_netdev, NETDEV_KIND_MACSEC, offsetof(Network, stacked_netdev_names) +Network.MACVLAN, config_parse_stacked_netdev, NETDEV_KIND_MACVLAN, offsetof(Network, stacked_netdev_names) +Network.MACVTAP, config_parse_stacked_netdev, NETDEV_KIND_MACVTAP, offsetof(Network, stacked_netdev_names) Network.Tunnel, config_parse_stacked_netdev, _NETDEV_KIND_TUNNEL, offsetof(Network, stacked_netdev_names) +Network.VLAN, config_parse_stacked_netdev, NETDEV_KIND_VLAN, offsetof(Network, stacked_netdev_names) +Network.VXLAN, config_parse_stacked_netdev, NETDEV_KIND_VXLAN, offsetof(Network, stacked_netdev_names) Network.Xfrm, config_parse_stacked_netdev, NETDEV_KIND_XFRM, offsetof(Network, stacked_netdev_names) -Network.VRF, config_parse_ifname, 0, offsetof(Network, vrf_name) Network.DHCP, config_parse_dhcp, 0, offsetof(Network, dhcp) Network.DHCPServer, config_parse_bool, 0, offsetof(Network, dhcp_server) Network.LinkLocalAddressing, config_parse_link_local_address_family, 0, offsetof(Network, link_local) From c3006a485c9c35c0ab947479ff1dd7149fda9750 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 10 Jun 2021 04:45:54 +0900 Subject: [PATCH 3/3] man: add missing settings Fixes #19869. --- man/systemd.network.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/man/systemd.network.xml b/man/systemd.network.xml index d9a415bd4e..b059ed0771 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -915,14 +915,18 @@ IPv6Token=prefixstable:2002:da8:1:: IPVLAN= + IPVTAP= + L2TP= MACsec= MACVLAN= + MACVTAP= Tunnel= VLAN= VXLAN= + Xfrm= - The name of a IPVLAN, MACsec, MACVLAN, tunnel, VLAN, or VXLAN to be created on the - link. See + The name of a IPVLAN, IPVTAP, L2TP, MACsec, MACVLAN, MACVTAP, tunnel, VLAN, VXLAN, or + Xfrm to be created on the link. See systemd.netdev5. This option may be specified more than once.