X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.netdev.xml;h=e278aa1a8084066d4cde915e92f93e88442a6041;hb=5fae368bda9419d9d378ea32077c8fd183dd4b81;hp=f6e385a97a0a452dbbd3f6d28cd85b79ea72e354;hpb=855ee1a1d272b599410212b40768a9c71f260e37;p=elogind.git
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index f6e385a97..e278aa1a8 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -83,6 +83,81 @@
+
+ Supported netdev kinds
+
+ The following kinds of virtual network devices may be configured in .netdev files:
+
+
+ Supported kinds of virtual network devices
+
+
+
+
+
+ Kind
+ Description
+
+
+ bond
+ A bond device is an aggregation of all its slave devices. See Linux Ethernet Bonding Driver HOWTO for details.Local configuration
+
+ bridge
+ A bridge devcie is a software switch, each of its slave devices and the bridge itself are ports of the switch.
+
+ dummy
+ A dummy device drops all packets sent to it.
+
+ gre
+ A Level 3 GRE tunnel over IPv4. See RFC 2784 for details.
+
+ gretap
+ A Level 2 GRE tunnel over IPv4.
+
+ ip6gre
+ A Level 3 GRE tunnel over IPv6.
+
+ ip6tnl
+ An IPv4 or IPv6 tunnel over IPv6
+
+ ip6gretap
+ An Level 2 GRE tunnel over IPv6.
+
+ ipip
+ An IPv4 over IPv4 tunnel.
+
+ ipvlan
+ An ipvlan device is a stacked device which receives packets from its underlying device based on IP address filtering.
+
+ macvlan
+ A macvlan device is a stacked device which receives packets from its underlying device based on MAC address filtering.
+
+ sit
+ An IPv6 over IPv4 tunnel.
+
+ tap
+ A persistent Level 2 tunnel between a network device and a device node.
+
+ tun
+ A persistent Level 3 tunnel between a network device and a device node.
+
+ veth
+ An ethernet tunnel between a pair of network devices.
+
+ vlan
+ A VLAN is a stacked device which receives packets from its underlying device based on VLAN tagging. See IEEE 802.1Q for details.
+
+ vti
+ An IPv4 over IPSec tunnel.
+
+ vxlan
+ A virtual extensible LAN (vxlan), for connecting Cloud computing deployments.
+
+
+
+
+
+
[Match] Section Options
@@ -161,16 +236,8 @@
Kind=
- The netdev kind. Currently, bridge,
- bond, vlan,
- macvlan,
- ipvlan, vxlan,
- ipip, gre,
- gretap, sit,
- vti, veth,
- tun, tap and
- dummy
- are supported. This option is compulsory.
+ The netdev kind. This option is compulsory. See the Supported netdev kinds section
+ for the valid keys.
@@ -331,7 +398,8 @@
The [Tunnel] section only applies for netdevs of kind
ipip, sit, gre, gretap,
- vti and ip6tnl and accepts the following keys:
+ ip6gre, ip6gretap, vti and ip6tnl
+ and accepts the following keys:
@@ -376,20 +444,13 @@
Mode=
- IPv6 tunnels can have three mode
- ip6ip6
- ip4ipv6,
- any
+ An ip6tnl tunnels can have three modes
+ ip6ip6 for IPv6 over IPv6,
+ ipip6 for IPv4 over IPv6 or
+ any for either.
-
-
- Mode=
-
- The mode specifies the ip6 tunnel protocol. Supported type are
-
-