X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.network.xml;h=3af199e84ac9b0d88614f0448c99b3e59f7e57fd;hb=bd8f65387673e29f46136a4ed172097035002c23;hp=21f6d50cc76911cf27844a5ba865dd9bc68b3e26;hpb=8d0e0ddda6501479eb69164687c83c1a7667b33a;p=elogind.git
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 21f6d50cc..3af199e84 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -195,19 +195,44 @@
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.
IPv4LL=
A boolean. When true, enables IPv4 link-local support.
- If DHCP= is also true, acquiring DHCP address
- will deprecate previously acquired IPv4 link-local address or
- stop acquiring process if one has not been acquired before.
+
+ IPv4LLRoute=
+
+ A boolean. When true, sets up the route needed for
+ non-IPv4LL hosts to communicate with IPv4LL-only hosts. Defaults
+ to true.
+
+
+
+
+ LLMNR=
+
+ A boolean or resolve. When true, enables
+ Link-Local Multicast Name Resolution on the link, when set to
+ resolve only resolution is enabled, but not
+ announcement. Defaults to true.
+
+
Address=
@@ -237,14 +262,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 +301,7 @@
This option may be specified more than once.
+
Bridge=
@@ -302,6 +328,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.
+
+
@@ -320,6 +360,13 @@
As in the [Network] section. This key is mandatory.
+
+ Peer=
+
+ The peer address in a point-to-point connection. Accepts the same format as
+ the Address key.
+
+
Broadcast=
@@ -357,12 +404,18 @@
prefixlength. If ommitted, a full-length host route is assumed.
+
+ Metric=
+
+ The metric of the route. An unsigned integer
+
+
- [DHCPv4] Section Options
- The [DHCPv4] section accepts the following keys:
+ [DHCP] Section Options
+ The [DHCP] section accepts the following keys:
@@ -379,6 +432,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 +446,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=
@@ -394,6 +461,21 @@
if, say, the root filesystem relies on this connection. Defaults to false.
+
+ VendorClassIdentifier=
+
+ The vendor class identifier used to identify vendor type and configuration.
+
+
+
+ RequestBroadcast=
+
+ Request the server to use broadcast messages before the IP address has been
+ configured. This is necessary for devices that cannot receive RAW packets, or that
+ cannot receive packets at all before an IP address has been configured. On the other
+ hand, this must not be enabled on networks where broadcasts are filtered out.
+
+
@@ -418,7 +500,7 @@ Gateway=192.168.0.1
Name=en*
[Network]
-DHCP=yes
+DHCP=both
@@ -442,6 +524,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
+