diff --git a/man/common_options.adoc b/man/common_options.adoc index 1dbbfb61..4569d343 100644 --- a/man/common_options.adoc +++ b/man/common_options.adoc @@ -293,7 +293,7 @@ When used together with parameter --new-key-slot this option allows you to speci key slot is selected for unlocking volume key. + *NOTE:* This option is ignored if existing volume key gets unlocked -via LUSK2 token (--token-id, --token-type or --token-only parameters) or +via LUKS2 token (--token-id, --token-type or --token-only parameters) or when volume key is provided directly via --volume-key-file parameter. + *NOTE:* To maintain backward compatibility, without --new-key-slot parameter, @@ -801,7 +801,7 @@ ifdef::ACTION_OPEN,ACTION_RESIZE,ACTION_LUKSRESUME,ACTION_TOKEN,ACTION_LUKSADDKE *--token-id*:: ifndef::ACTION_TOKEN,ACTION_LUKSADDKEY[] Specify what token to use. If omitted, all available tokens will be checked -before proceeding further with passphrase prompt.a +before proceeding further with passphrase prompt. endif::[] ifdef::ACTION_LUKSADDKEY[] Specify what token to use when unlocking existing keyslot to get volume key. diff --git a/man/cryptsetup-luksAddKey.8.adoc b/man/cryptsetup-luksAddKey.8.adoc index cc44582a..9686a1dd 100644 --- a/man/cryptsetup-luksAddKey.8.adoc +++ b/man/cryptsetup-luksAddKey.8.adoc @@ -46,19 +46,19 @@ include::man/common_options.adoc[] *NOTE*: When not specified otherwise interactive passphrase prompt is always default method. -Add new keyslot using interactive passphrase promtp for both existing and new passphrase: +Add new keyslot using interactive passphrase prompt for both existing and new passphrase: *cryptsetup luksAddKey /dev/device* -Add new keyslot using LUKS2 tokens to unlock existing keyslot with interactive passphrase promtp for new passphrase: +Add new keyslot using LUKS2 tokens to unlock existing keyslot with interactive passphrase prompt for new passphrase: *cryptsetup luksAddKey --token-only /dev/device* -Add new keyslot using LUKS2 systemd-tpm2 tokens to unlock existing keyslot with interactive passphrase promtp for new passphrase (systemd-tpm2 token plugin must be available): +Add new keyslot using LUKS2 systemd-tpm2 tokens to unlock existing keyslot with interactive passphrase prompt for new passphrase (systemd-tpm2 token plugin must be available): *cryptsetup luksAddKey --token-type systemd-tpm2 /dev/device* -Add new keyslot using interactive passphrase promtp for existing keyslot, reading new passphrase from key_file: +Add new keyslot using interactive passphrase prompt for existing keyslot, reading new passphrase from key_file: *cryptsetup luksAddKey --new-keyfile key_file /dev/device* or *cryptsetup luksAddKey /dev/device key_file*