X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.netdev.xml;h=0a2cbab09398e355bb03d4b192898a7d00971063;hb=e1bbf3d12f28b8e3d4394f2b257e1b7aea3d10fc;hp=a57ba7ad8cf1ecf9cd00d5e2da21d93c100efd7b;hpb=30ae9dfda3788cdfaf1b84d124dbc7feb638c77b;p=elogind.git
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index a57ba7ad8..0a2cbab09 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -60,7 +60,10 @@
Virtual Network Device files must have the extension
.netdev; other extensions are ignored. Virtual
- network devices are created as soon as networkd is started.
+ network devices are created as soon as networkd is started. If a netdev
+ with the specified name already exists, networkd will use that as-is
+ rather than create its own. Note that the settings of the pre-existing
+ netdev will not be changed by networkd.
The .netdev files are read from the files located in the
system network directory /usr/lib/systemd/network,
@@ -163,7 +166,8 @@
macvlan, vxlan,
ipip, gre,
sit, vti,
- veth, and dummy
+ veth, tun,
+ tap and dummy
are supported. This option is compulsory.
@@ -340,51 +344,45 @@
- [TUN] Section Options
+ [Tun] Section Options
- The [TUN] section only applies for netdevs of kind
+ The [Tun] section only applies for netdevs of kind
tun, and accepts the following keys:
OneQueue=
Takes a boolean argument. Configures whether
- to enable disable one queue . it determines whether all packets
- queue at the device (enabled), or a fixed number queue at the device and
- the rest at the "qdisc". Defaults to no.
+ all packets are queued at the device (enabled), or a fixed number
+ of packets are queued at the device and the rest at the
+ qdisc. Defaults to no.
MultiQueue=
- Takes a boolean argument. Configures whether the
- to disable or disable . Linux supports multiqueue tuntap which can
- uses multiple file descriptors (queues) to parallelize
- packets sending or receiving. The device allocation is the same as before,
- and if user wants to create multiple queues. Defaults to
- no.
+ Takes a boolean argument. Configures whether to
+ use multiple file descriptors (queues) to parallelize packets
+ sending and receiving. Defaults to no.
PacketInfo=
- Takes a boolean argument. Configures whether the
- to enable or disable . PacketInfo tells the kernel to not provide packet
- information. The purpose of PacketInfo is to tell the kernel that packets
- will be "pure" IP packets, with no added bytes. Otherwise (if PacketInfo is unset),
- 4 extra bytes are added to the beginning of the packet (2 flag bytes and 2 protocol bytes).
- Defaults to no.
+ Takes a boolean argument. Configures whether packets
+ should be prepened with four extra bytes (two flag bytes and two
+ protocol bytes). If disabled it indicates that the packets will be
+ pure IP packets. Defaults to no.
User=
- User to be allowed to access this device. Give ownership to unprivileged users,
- so that /dev/net/tun device to be usable by this user.
-
+ User to grant access to the /dev/net/tun
+ device.
Group=
- Group to be allowed to access this device. Give ownership to unprivileged group,
- so that /dev/net/tun device to be usable by this group.
+ Group to grant access to the /dev/net/tun
+ device.
@@ -393,57 +391,36 @@
- [TAP] Section Options
+ [Tap] Section Options
- The [TAP] section only applies for netdevs of kind
- tap, and accepts the following keys:
+ The [Tap] section only applies for netdevs of kind
+ tap, and accepts the same keys as the
+ [Tun] section.
+
+ [Bond] Section Options
+
+ The [Bond] section accepts the following
+ key:
+
- OneQueue=
- Takes a boolean argument. Configures whether
- to enable disable one queue . it determines whether all packets
- queue at the device (enabled), or a fixed number queue at the device and
- the rest at the "qdisc". Defaults to no.
-
-
-
- MultiQueue=
- Takes a boolean argument. Configures whether the
- to disable or disable . From version 3.8, Linux supports multiqueue
- tuntap which can uses multiple file descriptors (queues) to parallelize
- packets sending or receiving. The device allocation is the same as before,
- and if user wants to create multiple queues. Defaults to
- no.
-
-
-
- PacketInfo=
- Takes a boolean argument. Configures whether the
- to enable or disable . PacketInfo tells the kernel to not provide packet
- information. The purpose of PacketInfo is to tell the kernel that packets
- will be "pure" IP packets, with no added bytes. Otherwise (if PacketInfo is unset),
- 4 extra bytes are added to the beginning of the packet (2 flag bytes and 2 protocol bytes).
- Defaults to no.
-
-
-
- User=
- User to be allowed to access this device. Give ownership to unprivileged users,
- so that /dev/net/tun device to be usable by this user.
-
-
-
-
- Group=
- Group to be allowed to access this device. Give ownership to unprivileged group,
- so that /dev/net/tun device to be usable by this group.
+ Mode=
+
+ Specifies one of the bonding policies. The default is balance-rr (round robin).
+ balance-rr
+ active-backup
+ balance-xor
+ broadcast
+ 802.3ad
+ balance-tlb
+ balance-alb
+
-
-
+
Example