system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 18:24:38 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

units: add ConditionSecurity=tpm2 to systemd-tpm2-setup units

Browse source 
ConditionSecurity=measured-uki can be true even with TPM 1.2 which we
don't support, so add an explicit check for TPM 2.0.

Fixes https://github.com/systemd/systemd/issues/30650

Follow-up for 2e64cb71b9
This commit is contained in:
Luca Boccassi 2023-12-28 17:32:06 +01:00 committed by Yu Watanabe
parent c6dcd70a37
commit aa735b0219
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
units/systemd-tpm2-setup-early.service.in
View file

@ -14,6 +14,7 @@ DefaultDependencies=no
Conflicts=shutdown.target
Before=sysinit.target shutdown.target
ConditionSecurity=measured-uki
ConditionSecurity=tpm2
ConditionPathExists=!/run/systemd/tpm2-srk-public-key.pem
[Service]

1
units/systemd-tpm2-setup.service.in
View file

@ -16,6 +16,7 @@ After=systemd-tpm2-setup-early.service systemd-remount-fs.service
Before=sysinit.target shutdown.target
RequiresMountsFor=/var/lib/systemd/tpm2-srk-public-key.pem
ConditionSecurity=measured-uki
ConditionSecurity=tpm2
ConditionPathExists=!/etc/initrd-release
[Service]