Merge pull request #32402 from poettering/tpm2-setup-pcrextend-order

units: order tpm2-setup-early and pcrphase-initrd against each other
This commit is contained in:
Lennart Poettering 2024-04-22 17:47:51 +02:00 committed by GitHub
commit f96f1d68c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions

View file

@ -12,10 +12,10 @@ Description=Early TPM SRK Setup
Documentation=man:systemd-tpm2-setup.service(8)
DefaultDependencies=no
Conflicts=shutdown.target
After=tpm2.target systemd-pcrphase-initrd.service
Before=sysinit.target shutdown.target
ConditionSecurity=measured-uki
ConditionPathExists=!/run/systemd/tpm2-srk-public-key.pem
After=tpm2.target
[Service]
Type=oneshot

View file

@ -12,12 +12,11 @@ Description=TPM SRK Setup
Documentation=man:systemd-tpm2-setup.service(8)
DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-tpm2-setup-early.service systemd-remount-fs.service
After=tpm2.target 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
ConditionPathExists=!/etc/initrd-release
After=tpm2.target
[Service]
Type=oneshot