Merging upstream version 4.23.0.

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

1 files changed, 33 insertions, 5 deletions

diff --git a/upstream/fedora-rawhide/man8/systemd-network-generator.service.8 b/upstream/fedora-rawhide/man8/systemd-network-generator.service.8
index e2d012e7..5a39caa3 100644
--- a/upstream/fedora-rawhide/man8/systemd-network-generator.service.8
+++ b/upstream/fedora-rawhide/man8/systemd-network-generator.service.8
@@ -1,5 +1,5 @@
 '\" t
-.TH "SYSTEMD\-NETWORK\-GENERATOR\&.SERVICE" "8" "" "systemd 255" "systemd-network-generator.service"
+.TH "SYSTEMD\-NETWORK\-GENERATOR\&.SERVICE" "8" "" "systemd 256~rc3" "systemd-network-generator.service"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -68,7 +68,7 @@ option accepts the special value
 Added in version 245\&.
 .RE
 .PP
-\fIifname=\fR, \fInet\&.ifname\-policy=\fR
+\fIifname=\fR, \fInet\&.ifname_policy=\fR
 .RS 4
 Translated into
 \fBsystemd.link\fR(5)
@@ -91,8 +91,36 @@ See
 and
 \fBsystemd-udevd.service\fR(8)
 for option syntax and details\&.
+.SH "CREDENTIALS"
+.PP
+\fBsystemd\-network\-generator\fR
+supports the service credentials logic as implemented by
+\fIImportCredential=\fR/\fILoadCredential=\fR/\fISetCredential=\fR
+(see
+\fBsystemd.exec\fR(5)
+for details)\&. The following credentials are used when passed in:
+.PP
+\fInetwork\&.conf\&.*\fR, \fInetwork\&.link\&.*\fR, \fInetwork\&.netdev\&.*\fR, \fInetwork\&.network\&.*\fR
+.RS 4
+These credentials should contain valid
+\fBnetworkd.conf\fR(5),
+\fBsystemd.link\fR(5),
+\fBsystemd.netdev\fR(5),
+\fBsystemd.network\fR(5)
+configuration data\&. From each matching credential a separate file is created\&. Example: a passed credential
+network\&.link\&.50\-foobar
+will be copied into a configuration file
+50\-foobar\&.link\&.
+.sp
+Note that the resulting files are created world\-readable, it\*(Aqs hence recommended to not include secrets in these credentials, but supply them via separate credentials directly to
+systemd\-networkd\&.service\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
+Note that by default the
+systemd\-network\-generator\&.service
+unit file is set up to inherit the these credentials from the service manager\&.
 .SH "SEE ALSO"
 .PP
-\fBsystemd\fR(1),
-\fBsystemd-networkd.service\fR(8),
-\fBdracut\fR(8)
+\fBsystemd\fR(1), \fBsystemd-networkd.service\fR(8), \fBdracut\fR(8)