chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: improve DHCP error logging
[elogind.git]
/
man
/
systemd.network.xml
diff --git
a/man/systemd.network.xml
b/man/systemd.network.xml
index 48e33ac4d43bba9c7d164c3bf331dadf77bded27..f80212944df3e1d86640eb64c500659288c0b95e 100644
(file)
--- a/
man/systemd.network.xml
+++ b/
man/systemd.network.xml
@@
-78,6
+78,11
@@
<filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
disables the configuration file entirely.</para>
<filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
disables the configuration file entirely.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>[Match] Section Options</title>
+
<para>The network file contains a <literal>[Match]</literal> section,
which determines if a given network file may be applied to a given device;
and a <literal>[Network]</literal> section specifying how the device should
<para>The network file contains a <literal>[Match]</literal> section,
which determines if a given network file may be applied to a given device;
and a <literal>[Network]</literal> section specifying how the device should
@@
-172,6
+177,11
@@
</varlistentry>
</variablelist>
</varlistentry>
</variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>[Network] Section Options</title>
+
<para>The <literal>[Network]</literal> section accepts the following keys:</para>
<variablelist class='network-directives'>
<para>The <literal>[Network]</literal> section accepts the following keys:</para>
<variablelist class='network-directives'>
@@
-185,7
+195,9
@@
<varlistentry>
<term><varname>DHCP=</varname></term>
<listitem>
<varlistentry>
<term><varname>DHCP=</varname></term>
<listitem>
- <para>A boolean. When true, enables basic DHCPv4 support.</para>
+ <para>Enables DHCPv4 and/or DHCPv6 support. Accepts
+ <literal>both</literal>, <literal>none</literal>,
+ <literal>v4</literal> or <literal>v6</literal>.</para>
</listitem>
</varlistentry>
<varlistentry>
</listitem>
</varlistentry>
<varlistentry>
@@
-210,6
+222,43
@@
an Address key (see below). This option may be specified
more than once.
</para>
an Address key (see below). This option may be specified
more than once.
</para>
+
+ <para>If the specified
+ address is 0.0.0.0
+ (for IPv4) or [::]
+ (for IPv6), a new
+ address range of the
+ requested size is
+ automatically
+ allocated from a
+ system-wide pool of
+ unused ranges. The
+ allocated range is
+ checked against all
+ current network
+ interfaces and all
+ known network
+ configuration files to
+ 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::/7 for
+ IPv6. This
+ functionality is
+ useful to manage a
+ large number of
+ dynamically created
+ network interfaces
+ with the same network
+ configuration and
+ automatic address
+ range
+ assignment.</para>
+
</listitem>
</varlistentry>
<varlistentry>
</listitem>
</varlistentry>
<varlistentry>
@@
-257,6
+306,11
@@
</varlistentry>
</variablelist>
</varlistentry>
</variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>[Address] Section Options</title>
+
<para>An <literal>[Address]</literal> section accepts the following keys.
Specify several <literal>[Address]</literal> sections to configure several
addresses.</para>
<para>An <literal>[Address]</literal> section accepts the following keys.
Specify several <literal>[Address]</literal> sections to configure several
addresses.</para>
@@
-272,8
+326,8
@@
<term><varname>Broadcast=</varname></term>
<listitem>
<para>The broadcast address, which must be in the format described in
<term><varname>Broadcast=</varname></term>
<listitem>
<para>The broadcast address, which must be in the format described in
- <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-
.
This key only applies to IPv4 addresses. If it is not given, it is
+ <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>
.
+ This key only applies to IPv4 addresses. If it is not given, it is
derived from the <literal>Address</literal> key.</para>
</listitem>
</varlistentry>
derived from the <literal>Address</literal> key.</para>
</listitem>
</varlistentry>
@@
-284,7
+338,10
@@
</listitem>
</varlistentry>
</variablelist>
</listitem>
</varlistentry>
</variablelist>
+ </refsect1>
+ <refsect1>
+ <title>[Route] Section Options</title>
<para>The <literal>[Route]</literal> section accepts the following keys. Specify
several <literal>[Route]</literal> sections to configure several routes.</para>
<para>The <literal>[Route]</literal> section accepts the following keys. Specify
several <literal>[Route]</literal> sections to configure several routes.</para>
@@
-299,12
+356,15
@@
<term><varname>Destination=</varname></term>
<listitem>
<para>The destination prefix of the route. Possibly followed by a slash and the
<term><varname>Destination=</varname></term>
<listitem>
<para>The destination prefix of the route. Possibly followed by a slash and the
- prefixlength
, if ommitted
a full-length host route is assumed.</para>
+ prefixlength
. If ommitted,
a full-length host route is assumed.</para>
</listitem>
</varlistentry>
</variablelist>
</listitem>
</varlistentry>
</variablelist>
+ </refsect1>
- <para>The <literal>[DHCPv4]</literal> section accepts the following keys:</para>
+ <refsect1>
+ <title>[DHCP] Section Options</title>
+ <para>The <literal>[DHCP]</literal> section accepts the following keys:</para>
<variablelist class='network-directives'>
<varlistentry>
<variablelist class='network-directives'>
<varlistentry>
@@
-328,6
+388,13
@@
will be used as the transient hostname.</para>
</listitem>
</varlistentry>
will be used as the transient hostname.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><varname>UseRoutes=</varname></term>
+ <listitem>
+ <para>When true (the default), the static routes will be requested from the DHCP server
+ and added to the routing table with metric of 1024.</para>
+ </listitem>
+ </varlistentry>
<varlistentry>
<term><varname>CriticalConnection=</varname></term>
<listitem>
<varlistentry>
<term><varname>CriticalConnection=</varname></term>
<listitem>