From: Lennart Poettering <lennart@amutable.com>
Date: Thu, 9 Jul 2026 09:26:36 +0000 (+0200)
Subject: units: properly wait for swtpm to finish before the initrd transition
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=973b429eb4376dfb9ce5cacd6f36b138c1d73764;p=thirdparty%2Fsystemd.git

units: properly wait for swtpm to finish before the initrd transition

Hopefully fixes: #42936
---

diff --git a/units/systemd-tpm2-swtpm.service.in b/units/systemd-tpm2-swtpm.service.in
index e9127f34c90..d7accfb330a 100644
--- a/units/systemd-tpm2-swtpm.service.in
+++ b/units/systemd-tpm2-swtpm.service.in
@@ -11,11 +11,11 @@
 Description=Fallback Software TPM
 Documentation=man:systemd-tpm2-swtpm.service(8)
 DefaultDependencies=no
-Conflicts=shutdown.target
+Conflicts=shutdown.target initrd-switch-root.target
 After=systemd-sysusers.service
 Wants=modprobe@tpm_vtpm_proxy.service
 After=modprobe@tpm_vtpm_proxy.service
-Before=tpm2.target sysinit.target shutdown.target
+Before=tpm2.target sysinit.target shutdown.target initrd-switch-root.target
 
 [Service]
 CapabilityBoundingSet=CAP_SYS_ADMIN