From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 7 Mar 2025 13:55:43 +0000 (+0100)
Subject: rules: tag /dev/tpm0 with "systemd" too
X-Git-Tag: v258-rc1~1147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc4cf3e539df671d55e51f9da6b7cdfb765e5068;p=thirdparty%2Fsystemd.git

rules: tag /dev/tpm0 with "systemd" too

Strictly speaking we don't need to tag these devices, because tpm2-tss
already does so, but given we do this for /dev/tpmrm0, we should
probably do this comprehensively if we rely on this ourselves.

Fixes: #36653
---

diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in
index 3fd3ea3ecd0..18622d6bf25 100644
--- a/rules.d/99-systemd.rules.in
+++ b/rules.d/99-systemd.rules.in
@@ -104,7 +104,9 @@ SUBSYSTEM=="misc", KERNEL=="rfkill", TAG+="systemd", ENV{SYSTEMD_WANTS}+="system
 SUBSYSTEM=="module", KERNEL=="fuse", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sys-fs-fuse-connections.mount"
 SUBSYSTEM=="module", KERNEL=="configfs", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sys-kernel-config.mount"
 
-# Pull in tpm2.target whenever /dev/tpmrm* shows up
+# Pull in tpm2.target whenever the full-blown /dev/tpmrm* shows up (and also
+# tag the version without resource manager, so that we can sync on it).
 SUBSYSTEM=="tpmrm", KERNEL=="tpmrm[0-9]*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="tpm2.target"
+SUBSYSTEM=="tpm", KERNEL=="tpm[0-9]*", TAG+="systemd"
 
 LABEL="systemd_end"