diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-05-25 23:26:31 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-05-25 23:28:54 +0200 |
| commit | a1788a69b27b497ea75af2a97d7d7abde3e06eff (patch) | |
| tree | 59071785c1dfa9199df8d787141b9eb0accc4276 /src/cryptenroll/cryptenroll.c | |
| parent | Merge pull request #19322 from poettering/dep-split (diff) | |
| download | systemd-a1788a69b27b497ea75af2a97d7d7abde3e06eff.tar.xz systemd-a1788a69b27b497ea75af2a97d7d7abde3e06eff.zip | |
tpm2: support "+" as separator for TPM PCR lists
Previously, we supported only "," as separator. This adds support for
"+" and makes it the documented choice.
This is to make specifying PCRs in crypttab easier, since commas are
already used there for separating volume options, and needless escaping
sucks.
"," continues to be supported, but in order to keep things minimal not
documented.
Fixe: #19205
Diffstat (limited to 'src/cryptenroll/cryptenroll.c')
| -rw-r--r-- | src/cryptenroll/cryptenroll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c index 559a346804..83b0b42ff2 100644 --- a/src/cryptenroll/cryptenroll.c +++ b/src/cryptenroll/cryptenroll.c @@ -97,7 +97,7 @@ static int help(void) { " Whether to require user verification to unlock the volume\n" " --tpm2-device=PATH\n" " Enroll a TPM2 device\n" - " --tpm2-pcrs=PCR1,PCR2,PCR3,…\n" + " --tpm2-pcrs=PCR1+PCR2+PCR3,…\n" " Specify TPM2 PCRs to seal against\n" " --wipe-slot=SLOT1,SLOT2,…\n" " Wipe specified slots\n" |