Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 125 insertions, 23 deletions

diff --git a/upstream/debian-unstable/man5/networkd.conf.5 b/upstream/debian-unstable/man5/networkd.conf.5
index caead9da..9064e702 100644
--- a/upstream/debian-unstable/man5/networkd.conf.5
+++ b/upstream/debian-unstable/man5/networkd.conf.5
@@ -1,5 +1,5 @@
 '\" t
-.TH "NETWORKD\&.CONF" "5" "" "systemd 255" "networkd.conf"
+.TH "NETWORKD\&.CONF" "5" "" "systemd 256~rc3" "networkd.conf"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -23,26 +23,39 @@
 networkd.conf, networkd.conf.d \- Global Network configuration files
 .SH "SYNOPSIS"
 .PP
+.RS 4
 /etc/systemd/networkd\&.conf
-.PP
+.RE
+.RS 4
+/run/systemd/networkd\&.conf
+.RE
+.RS 4
+/usr/lib/systemd/networkd\&.conf
+.RE
+.RS 4
 /etc/systemd/networkd\&.conf\&.d/*\&.conf
-.PP
+.RE
+.RS 4
+/run/systemd/networkd\&.conf\&.d/*\&.conf
+.RE
+.RS 4
 /usr/lib/systemd/networkd\&.conf\&.d/*\&.conf
+.RE
 .SH "DESCRIPTION"
 .PP
-These configuration files control global network parameters\&. Currently the DHCP Unique Identifier (DUID)\&.
+These configuration files control global network parameters\&.
 .SH "CONFIGURATION DIRECTORIES AND PRECEDENCE"
 .PP
-The default configuration is set during compilation, so configuration is only needed when it is necessary to deviate from those defaults\&. The main configuration file is either in
-/usr/lib/systemd/
-or
-/etc/systemd/
-and contains commented out entries showing the defaults as a guide to the administrator\&. Local overrides can be created by creating drop\-ins, as described below\&. The main configuration file can also be edited for this purpose (or a copy in
+The default configuration is set during compilation, so configuration is only needed when it is necessary to deviate from those defaults\&. The main configuration file is loaded from one of the listed directories in order of priority, only the first file found is used:
+/etc/systemd/,
+/run/systemd/,
+/usr/local/lib/systemd/,
+/usr/lib/systemd/\&. The vendor version of the file contains commented out entries showing the defaults as a guide to the administrator\&. Local overrides can also be created by creating drop\-ins, as described below\&. The main configuration file can also be edited for this purpose (or a copy in
 /etc/
-if it\*(Aqs shipped in
-/usr/) however using drop\-ins for local configuration is recommended over modifications to the main configuration file\&.
+if it\*(Aqs shipped under
+/usr/), however using drop\-ins for local configuration is recommended over modifications to the main configuration file\&.
 .PP
-In addition to the "main" configuration file, drop\-in configuration snippets are read from
+In addition to the main configuration file, drop\-in configuration snippets are read from
 /usr/lib/systemd/*\&.conf\&.d/,
 /usr/local/lib/systemd/*\&.conf\&.d/, and
 /etc/systemd/*\&.conf\&.d/\&. Those drop\-ins have higher precedence and override the main configuration file\&. Files in the
@@ -52,7 +65,12 @@ configuration subdirectories are sorted by their filename in lexicographic order
 When packages need to customize the configuration, they can install drop\-ins under
 /usr/\&. Files in
 /etc/
-are reserved for the local administrator, who may use this logic to override the configuration files installed by vendor packages\&. Drop\-ins have to be used to override package drop\-ins, since the main configuration file has lower precedence\&. It is recommended to prefix all filenames in those subdirectories with a two\-digit number and a dash, to simplify the ordering of the files\&. This also defined a concept of drop\-in priority to allow distributions to ship drop\-ins within a specific range lower than the range used by users\&. This should lower the risk of package drop\-ins overriding accidentally drop\-ins defined by users\&.
+are reserved for the local administrator, who may use this logic to override the configuration files installed by vendor packages\&. Drop\-ins have to be used to override package drop\-ins, since the main configuration file has lower precedence\&. It is recommended to prefix all filenames in those subdirectories with a two\-digit number and a dash, to simplify the ordering of the files\&. This also defines a concept of drop\-in priorities to allow OS vendors to ship drop\-ins within a specific range lower than the range used by users\&. This should lower the risk of package drop\-ins overriding accidentally drop\-ins defined by users\&. It is recommended to use the range 10\-40 for drop\-ins in
+/usr/
+and the range 60\-90 for drop\-ins in
+/etc/
+and
+/run/, to make sure that local and transient drop\-ins take priority over drop\-ins shipped by the OS vendor\&.
 .PP
 To disable a configuration file supplied by the vendor, the recommended way is to place a symlink to
 /dev/null
@@ -111,6 +129,16 @@ is true or
 Added in version 246\&.
 .RE
 .PP
+\fIManageForeignNextHops=\fR
+.RS 4
+A boolean\&. When true,
+\fBsystemd\-networkd\fR
+will remove nexthops that are not configured in \&.network files (except for routes with protocol
+"kernel")\&. When false, it will not remove any foreign nexthops, keeping them even if they are not configured in a \&.network file\&. Defaults to yes\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
 \fIRouteTable=\fR
 .RS 4
 Defines the route table name\&. Takes a whitespace\-separated list of the pairs of route table name and number\&. The route table name and number in each pair are separated with a colon, i\&.e\&.,
@@ -122,6 +150,31 @@ Defines the route table name\&. Takes a whitespace\-separated list of the pairs
 Added in version 248\&.
 .RE
 .PP
+\fIIPv4Forwarding=\fR
+.RS 4
+Configures IPv4 packet forwarding for the system\&. Takes a boolean value\&. This controls the
+net\&.ipv4\&.conf\&.default\&.forwarding
+and
+net\&.ipv4\&.conf\&.all\&.forwardingsysctl options\&. See
+\m[blue]\fBIP Sysctl\fR\m[]\&\s-2\u[1]\d\s+2
+for more details about the sysctl options\&. Defaults to unset and the sysctl options will not be changed\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
+\fIIPv6Forwarding=\fR
+.RS 4
+Configures IPv6 packet forwarding for the system\&. Takes a boolean value\&. This controls the
+net\&.ipv6\&.conf\&.default\&.forwarding
+and
+net\&.ipv6\&.conf\&.all\&.forwarding
+sysctl options\&. See
+\m[blue]\fBIP Sysctl\fR\m[]\&\s-2\u[1]\d\s+2
+for more details about the sysctl options\&. Defaults to unset and the sysctl options will not be changed\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
 \fIIPv6PrivacyExtensions=\fR
 .RS 4
 Specifies the default value for per\-network
@@ -134,6 +187,30 @@ and
 .sp
 Added in version 254\&.
 .RE
+.PP
+\fIUseDomains=\fR
+.RS 4
+Specifies the network\- and protocol\-independent default value for the same settings in [IPv6AcceptRA], [DHCPv4], and [DHCPv6] sections below\&. Takes a boolean, or the special value
+\fBroute\fR\&. See the same setting in
+\fBsystemd.network\fR(5)\&. Defaults to
+"no"\&.
+.sp
+Added in version 256\&.
+.RE
+.SH "[IPV6ACCEPTRA] SECTION OPTIONS"
+.PP
+This section configures the default setting of the Neighbor Discovery\&. The following options are available in the [IPv6AcceptRA] section:
+.PP
+\fIUseDomains=\fR
+.RS 4
+Specifies the network\-independent default value for the same setting in the [IPv6AcceptRA] section in
+\fBsystemd.network\fR(5)\&. Takes a boolean, or the special value
+\fBroute\fR\&. When unspecified, the value specified in the [Network] section in
+\fBnetworkd.conf\fR(5), which defaults to
+"no", will be used\&.
+.sp
+Added in version 256\&.
+.RE
 .SH "[DHCPV4] SECTION OPTIONS"
 .PP
 This section configures the DHCP Unique Identifier (DUID) value used by DHCP protocol\&. DHCPv4 client protocol sends IAID and DUID to the DHCP server when acquiring a dynamic IPv4 address if
@@ -145,7 +222,7 @@ The following options are understood:
 \fIDUIDType=\fR
 .RS 4
 Specifies how the DUID should be generated\&. See
-\m[blue]\fBRFC 3315\fR\m[]\&\s-2\u[1]\d\s+2
+\m[blue]\fBRFC 3315\fR\m[]\&\s-2\u[2]\d\s+2
 for a description of all the options\&.
 .sp
 This takes an integer in the range 0\&...65535, or one of the following string values:
@@ -209,8 +286,8 @@ The DUID value specified here overrides the DUID that
 \fBsystemd-networkd.service\fR(8)
 generates from the machine ID\&. To configure DUID per\-network, see
 \fBsystemd.network\fR(5)\&. The configured DHCP DUID should conform to the specification in
-\m[blue]\fBRFC 3315\fR\m[]\&\s-2\u[2]\d\s+2,
-\m[blue]\fBRFC 6355\fR\m[]\&\s-2\u[3]\d\s+2\&. To configure IAID, see
+\m[blue]\fBRFC 3315\fR\m[]\&\s-2\u[3]\d\s+2,
+\m[blue]\fBRFC 6355\fR\m[]\&\s-2\u[4]\d\s+2\&. To configure IAID, see
 \fBsystemd.network\fR(5)\&.
 .PP
 \fBExample\ \&1.\ \&A DUIDType=vendor with a custom value\fR
@@ -231,6 +308,13 @@ This specifies a 14 byte DUID, with the type DUID\-EN ("00:02"), enterprise numb
 
 Added in version 230\&.
 .RE
+.PP
+\fIUseDomains=\fR
+.RS 4
+Same as the one in the [IPv6AcceptRA] section, but applied for DHCPv4 protocol\&.
+.sp
+Added in version 256\&.
+.RE
 .SH "[DHCPV6] SECTION OPTIONS"
 .PP
 This section configures the DHCP Unique Identifier (DUID) value used by DHCPv6 protocol\&. DHCPv6 client protocol sends the DHCP Unique Identifier and the interface Identity Association Identifier (IAID) to a DHCPv6 server when acquiring a dynamic IPv6 address\&. IAID and DUID allows a DHCPv6 server to uniquely identify the machine and the interface requesting a DHCP IP address\&. To configure IAID, see
@@ -244,25 +328,43 @@ As in the [DHCPv4] section\&.
 .sp
 Added in version 249\&.
 .RE
+.PP
+\fIUseDomains=\fR
+.RS 4
+As in the [DHCPv4] section\&.
+.sp
+Added in version 256\&.
+.RE
+.SH "[DHCPSERVER] SECTION OPTIONS"
+.PP
+This section configures the default setting of the DHCP server\&. The following options are available in the [DHCPServer] section:
+.PP
+\fIUseDomains=\fR
+.RS 4
+Same as the one in the [IPv6AcceptRA] section, but applied for DHCPv4 protocol\&.
+.sp
+Added in version 256\&.
+.RE
 .SH "SEE ALSO"
 .PP
-\fBsystemd\fR(1),
-\fBsystemd.network\fR(5),
-\fBsystemd-networkd.service\fR(8),
-\fBmachine-id\fR(5),
-\fBsd_id128_get_machine_app_specific\fR(3)
+\fBsystemd\fR(1), \fBsystemd.network\fR(5), \fBsystemd-networkd.service\fR(8), \fBmachine-id\fR(5), \fBsd_id128_get_machine_app_specific\fR(3)
 .SH "NOTES"
 .IP " 1." 4
+IP Sysctl
+.RS 4
+\%https://docs.kernel.org/networking/ip-sysctl.html
+.RE
+.IP " 2." 4
 RFC 3315
 .RS 4
 \%https://tools.ietf.org/html/rfc3315#section-9
 .RE
-.IP " 2." 4
+.IP " 3." 4
 RFC 3315
 .RS 4
 \%http://tools.ietf.org/html/rfc3315#section-9
 .RE
-.IP " 3." 4
+.IP " 4." 4
 RFC 6355
 .RS 4
 \%http://tools.ietf.org/html/rfc6355