From 9f32bb927c602f2e45369ef938b75c9e3b32c6db Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 2 Jan 2024 17:40:55 +0100 Subject: [PATCH] Revert "units: add ConditionSecurity=tpm2 to systemd-tpm2-setup units" Now that the ConditionSecurity=uki-measured check is tighter we can drop the explicit TPM2 check again. This reverts commit aa735b02196cf6f947fd1e4b2ec46b544ec7c3e1. --- units/systemd-tpm2-setup-early.service.in | 1 - units/systemd-tpm2-setup.service.in | 1 - 2 files changed, 2 deletions(-) diff --git a/units/systemd-tpm2-setup-early.service.in b/units/systemd-tpm2-setup-early.service.in index 57fe5e2537a..c1597ea3f9f 100644 --- a/units/systemd-tpm2-setup-early.service.in +++ b/units/systemd-tpm2-setup-early.service.in @@ -14,7 +14,6 @@ DefaultDependencies=no Conflicts=shutdown.target Before=sysinit.target shutdown.target ConditionSecurity=measured-uki -ConditionSecurity=tpm2 ConditionPathExists=!/run/systemd/tpm2-srk-public-key.pem [Service] diff --git a/units/systemd-tpm2-setup.service.in b/units/systemd-tpm2-setup.service.in index 9d882d690fa..6c99f3af0a6 100644 --- a/units/systemd-tpm2-setup.service.in +++ b/units/systemd-tpm2-setup.service.in @@ -16,7 +16,6 @@ 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] -- 2.47.3