X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-networkd.service.xml;h=1b1ea4c5fe8735be0af7e32bd51b8ca4ce14e2a1;hp=13443257823aac02feb8549e9b242ff5b812ecea;hb=89f7c8465cd1ab37347dd0c15920bce31e8225df;hpb=34a6dc7dcaa47a9efe083acc6f5fc6263414465e
diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index 134432578..1b1ea4c5f 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -64,8 +64,8 @@
Network configurations applied before networkd is started
are not removed, and configuration applied by networkd are not
removed when networkd exits. This ensures restarting networkd
- does not cut the network connection, and in particular that it
- is safe to transition between the initrd and the real root,
+ does not cut the network connection, and, in particular, that
+ it is safe to transition between the initrd and the real root,
and back.
@@ -80,18 +80,18 @@
identical filenames replace each other. Files in
/etc have the highest priority, files in
/run take precedence over files with the same
- name in /lib. This can be used to override a
+ name in /usr/lib. This can be used to override a
system-supplied configuration file with a local file if needed; a symlink in
/etc with the same name as a configuration file in
- /lib, pointing to /dev/null,
+ /usr/lib, pointing to /dev/null,
disables the configuration file entirely.
Virtual Network Devices
- Netdev files must have the extension .netdev;
- other extensions are ignored. Virtual network devices are created as soon
- as networkd is started.
+ Virtual Network Device files must have the extension
+ .netdev; other extensions are ignored. Virtual
+ network devices are created as soon as networkd is started.
- The [Bridge] section accepts the following
+ The [NetDev] section accepts the following
keys:
@@ -102,7 +102,28 @@
bridge. This option is compulsory.
+
+ Kind
+
+ The netdev kind. Currently, 'bridge', 'bond' and 'vlan'
+ are supported. This option is compulsory.
+
+
+
+ The [VLAN] section only applies for netdevs of kind 'vlan',
+ and accepts the following keys:
+
+
+
+ Id
+
+ The VLAN ID to use. An integer in the range 0-4094.
+ This option is compulsory.
+
+
+
+
Networks
@@ -168,6 +189,12 @@
presentation purposes.
+
+ DHCP
+
+ A boolean. When true enables basic DHCPv4 support.
+
+
Address
@@ -175,7 +202,7 @@
separated by a '/' character. The format of the address must
be as described in
inet_pton3
- .
+ . This is a short-hand for an [Address] section only containing an Address key (see below).
@@ -183,13 +210,34 @@
The gateway address, which must be in the format described in
inet_pton3
+ . This is a short-hand for a [Route] section only containing a Gateway key.
+
+
+
+ DNS
+
+ A DNS server address, which must be in the format described in
+ inet_pton3
.
Bridge
- The name of the bridge to add the configured link to.
+ The name of the bridge to add the link to.
+
+
+
+ Bond
+
+ The name of the bond to add the link to.
+
+
+
+ VLAN
+
+ The name of a VLAN to create on the link. This option
+ may be specified more than once.
@@ -200,7 +248,7 @@
Address
- As in the [Network] section.
+ As in the [Network] section. This key is mandatory.
@@ -209,7 +257,60 @@
An address label.
+
+
+ The [Route] section accepts the following keys:
+
+
+
+ Gateway
+
+ As in the [Network] section. This key is mandatory.
+
+
+
+ Destination
+
+ The destination prefix of the route. Possibly followed by a slash and the
+ prefixlength, if ommitted a full-length host route is assumed.
+
+
+
+
+ The [DHCPv4] section accepts the following keys:
+
+
+
+ UseDNS
+
+ When true (the default) the DNS servers received from the DHCP server will
+ be used, and take precedence over any statically configured ones.
+
+
+
+ UseMTU
+
+ When true the interface maximum transmission unit from the DHCP server will
+ be used on the current link. Defaults to false.
+
+
+
+ UseHostname
+
+ When true (the default) the hostname received from the DHCP server
+ will be used as the transient hostname.
+
+
+
+ CriticalConnection
+
+ When true the connection will never be torn down even if the DHCP lease
+ expires. This is contrary to the DHCP specification, but may be the best choice
+ if, say, the root filesystem relies on this connection. Defaults to false.
+
+
+