mirror of
https://github.com/systemd/systemd
synced 2024-10-15 04:24:19 +00:00
units: add ConditionSecurity=tpm2 to systemd-tpm2-setup units
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:
parent
c6dcd70a37
commit
aa735b0219
|
@ -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]
|
||||
|
|
|
@ -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]
|
||||
|
|
Loading…
Reference in a new issue