X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.network.xml;h=2b0eb567be02068683fa8074f2a63dfbdcb26ac7;hp=8b2dd2f1de55180a05384592a38a818a93033ba8;hb=4cc7a82c9490a3c5ae03b1d6d168ce40ba499e23;hpb=102bd40e1ed71c7ab980a90435a1c23d4c786c63
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 8b2dd2f1d..2b0eb567b 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -195,7 +195,17 @@
DHCP=
- A boolean. When true, enables basic DHCPv4 support.
+ Enables DHCPv4 and/or DHCPv6 support. Accepts
+ both, none,
+ v4 or v6.
+
+
+
+ DHCPServer=
+
+ A boolean. Enables a basic DHCPv4 server on the
+ device. Mostly useful for handing out leases to container
+ instances.
@@ -224,7 +234,7 @@
If the specified
address is 0.0.0.0
(for IPv4) or [::]
- (for IPv6) a new
+ (for IPv6), a new
address range of the
requested size is
automatically
@@ -237,14 +247,14 @@
interfaces and all
known network
configuration files to
- avoid IP range
+ avoid address range
conflicts. The default
system-wide pool
consists of
192.168.0.0/16,
172.16.0.0/12 and
10.0.0.0/8 for IPv4,
- and [fc00::] for
+ and fc00::/7 for
IPv6. This
functionality is
useful to manage a
@@ -276,6 +286,7 @@
This option may be specified more than once.
+
Bridge=
@@ -302,6 +313,20 @@
may be specified more than once.
+
+ VXLAN=
+
+ The name of a VXLAN to create on the link. This option
+ may be specified more than once.
+
+
+
+ Tunnel=
+
+ The name of a Tunnel to create on the link. This option
+ may be specified more than once.
+
+
@@ -361,8 +386,8 @@
- [DHCPv4] Section Options
- The [DHCPv4] section accepts the following keys:
+ [DHCP] Section Options
+ The [DHCP] section accepts the following keys:
@@ -379,6 +404,13 @@
be used on the current link. Defaults to false.
+
+ SendHostname=
+
+ When true (the default), the machine's hostname will be sent to the DHCP
+ server
+
+
UseHostname=
@@ -386,6 +418,13 @@
will be used as the transient hostname.
+
+ UseRoutes=
+
+ When true (the default), the static routes will be requested from the DHCP server
+ and added to the routing table with metric of 1024.
+
+
CriticalConnection=
@@ -442,6 +481,45 @@ Name=enp2s0
[Network]
Bridge=bridge0
+
+ /etc/systemd/network/ipip.network
+
+ [Match]
+Name=em1
+
+[Network]
+Tunnel=ipip-tun
+
+
+
+ /etc/systemd/network/sit.network
+
+ [Match]
+Name=em1
+
+[Network]
+Tunnel=sit-tun
+
+
+
+ /etc/systemd/network/gre.network
+
+ [Match]
+Name=em1
+
+[Network]
+Tunnel=gre-tun
+
+
+
+ /etc/systemd/network/vti.network
+
+ [Match]
+Name=em1
+
+[Network]
+Tunnel=vti-tun
+