]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
gpt-auto-generator: fix typo in crypttab option name
authorAntonio Alvarez Feijoo <antonio.feijoo@suse.com>
Thu, 13 Nov 2025 15:25:19 +0000 (16:25 +0100)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 13 Nov 2025 18:50:15 +0000 (03:50 +0900)
Spotted while debugging a ParticleOS build:

```
Nov 13 14:44:32 localhost systemd-cryptsetup[591]: Encountered unknown /etc/crypttab option 'tpm2-measure-slot-nvpcr=cryptsetup', ignoring.
```

Follow-up for e5a2e7866572614e66cbf6c1d3969128562d9552

src/gpt-auto-generator/gpt-auto-generator.c

index 6b5ca7ed6a06578effb04293033db3a8f2e75915..78525f3836c38f4143b0bb792655bf1189e55cde 100644 (file)
@@ -127,7 +127,7 @@ static int add_cryptsetup(
                  * assignment, under the assumption that people who are fine to use sd-stub with its PCR
                  * assignments are also OK with our PCR 15 use here. */
                 if (r > 0)
-                        if (!strextend_with_separator(&options, ",", "tpm2-measure-pcr=yes,tpm2-measure-slot-nvpcr=cryptsetup"))
+                        if (!strextend_with_separator(&options, ",", "tpm2-measure-pcr=yes,tpm2-measure-keyslot-nvpcr=cryptsetup"))
                                 return log_oom();
                 if (r == 0)
                         log_debug("Will not measure volume key of volume '%s', not booted via systemd-stub with measurements enabled.", id);