Adding upstream version 4.23.0.upstream/4.23.0

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

1 files changed, 50 insertions, 9 deletions

diff --git a/upstream/fedora-rawhide/man8/systemd-cryptsetup.8 b/upstream/fedora-rawhide/man8/systemd-cryptsetup.8
index cfa85bc0..3af52b7e 100644
--- a/upstream/fedora-rawhide/man8/systemd-cryptsetup.8
+++ b/upstream/fedora-rawhide/man8/systemd-cryptsetup.8
@@ -1,5 +1,5 @@
 '\" t
-.TH "SYSTEMD\-CRYPTSETUP" "8" "" "systemd 255" "systemd-cryptsetup"
+.TH "SYSTEMD\-CRYPTSETUP" "8" "" "systemd 256~rc3" "systemd-cryptsetup"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -37,9 +37,9 @@ is used to set up (with
 \fBattach\fR) and tear down (with
 \fBdetach\fR) access to an encrypted block device\&. It is primarily used via
 systemd\-cryptsetup@\&.service
-during early boot, but may also be be called manually\&. The positional arguments
+during early boot, but may also be called manually\&. The positional arguments
 \fIVOLUME\fR,
-\fISOURCEDEVICE\fR,
+\fISOURCE\-DEVICE\fR,
 \fIKEY\-FILE\fR, and
 \fICRYPTTAB\-OPTIONS\fR
 have the same meaning as the fields in
@@ -136,14 +136,55 @@ option is set\&.
 .RE
 .PP
 If no suitable key may be acquired via any of the mechanisms describes above, volume activation fails\&.
+.SH "CREDENTIALS"
+.PP
+\fBsystemd\-cryptsetup\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 by
+"systemd\-crypsetup@root\&.service"
+(generated by
+\fBsystemd\-gpt\-auto\-generator\fR) when passed in:
+.PP
+\fIcryptsetup\&.passphrase\fR
+.RS 4
+This credential specifies the passphrase of the LUKS volume\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
+\fIcryptsetup\&.tpm2\-pin\fR
+.RS 4
+This credential specifies the TPM pin\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
+\fIcryptsetup\&.fido2\-pin\fR
+.RS 4
+This credential specifies the FIDO2 token pin\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
+\fIcryptsetup\&.pkcs11\-pin\fR
+.RS 4
+This credential specifies the PKCS11 token pin\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
+\fIcryptsetup\&.luks2\-pin\fR
+.RS 4
+This credential specifies the PIN requested by generic LUKS2 token modules\&.
+.sp
+Added in version 256\&.
+.RE
 .SH "SEE ALSO"
 .PP
-\fBsystemd\fR(1),
-\fBsystemd-cryptsetup-generator\fR(8),
-\fBcrypttab\fR(5),
-\fBsystemd-cryptenroll\fR(1),
-\fBcryptsetup\fR(8),
-\m[blue]\fBTPM2 PCR Measurements Made by systemd\fR\m[]\&\s-2\u[2]\d\s+2
+\fBsystemd\fR(1), \fBsystemd-cryptsetup-generator\fR(8), \fBcrypttab\fR(5), \fBsystemd-cryptenroll\fR(1), \fBcryptsetup\fR(8), \m[blue]\fBTPM2 PCR Measurements Made by systemd\fR\m[]\&\s-2\u[2]\d\s+2
 .SH "NOTES"
 .IP " 1." 4
 password agent logic