units: retitle systemd-pcrextend.{service,socket}, change TPM2→TPM

I was looking at the logs in some bug and saw this:

Mar 13 15:55:12 fedora systemd[1]: systemd-pcrmachine.service - TPM2 PCR Machine ID Measurement was skipped because of an unmet condition check (ConditionSecurity=measured-uki).
Mar 13 15:55:12 fedora systemd[1]: Starting systemd-remount-fs.service - Remount Root and Kernel File Systems...
Mar 13 15:55:12 fedora systemd[1]: systemd-tpm2-setup-early.service - TPM2 SRK Setup (Early) was skipped because of an unmet condition check (ConditionSecurity=measured-uki).

This is overly technical, for most units we don't provide this level of
detail about the implementation. So retitle the units to be more accessible.

Also, the fact that it's a v. 2 of the TPM is not that important. We don't
support TPM 1.2, but computers without TPM v2 are getting rare. For other
units we don't advertise the version of hardware, and let's not do this here,
to reduce some complexity.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2024-03-13 22:18:13 +01:00
parent af02814a85
commit 3719dcb0bc
19 changed files with 19 additions and 19 deletions

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=TPM2 PCR Extension (Varlink)
Description=TPM PCR Measurements
Documentation=man:systemd-pcrextend(8)
DefaultDependencies=no
After=tpm2.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=TPM2 PCR Extension (Varlink)
Description=TPM PCR Measurements
Documentation=man:systemd-pcrphase.service(8)
DefaultDependencies=no
After=tpm2.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=TPM2 PCR Root File System Measurement
Description=TPM PCR Root File System Measurement
Documentation=man:systemd-pcrfs-root.service(8)
DefaultDependencies=no
Conflicts=shutdown.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=TPM2 PCR File System Measurement of %f
Description=TPM PCR File System Measurement of %f
Documentation=man:systemd-pcrfs@.service(8)
DefaultDependencies=no
BindsTo=%i.mount

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=Lock File Systems to TPM2 PCR Policy
Description=Lock File Systems to TPM PCR Policy
Documentation=man:systemd-pcrlock(8)
DefaultDependencies=no
Conflicts=shutdown.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=Lock Firmware Code to TPM2 PCR Policy
Description=Lock Firmware Code to TPM PCR Policy
Documentation=man:systemd-pcrlock(8)
DefaultDependencies=no
Conflicts=shutdown.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=Lock Firmware Configuration to TPM2 PCR Policy
Description=Lock Firmware Configuration to TPM PCR Policy
Documentation=man:systemd-pcrlock(8)
DefaultDependencies=no
Conflicts=shutdown.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=Lock Machine ID to TPM2 PCR Policy
Description=Lock Machine ID to TPM PCR Policy
Documentation=man:systemd-pcrlock(8)
DefaultDependencies=no
Conflicts=shutdown.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=Make TPM2 PCR Policy
Description=Make TPM PCR Policy
Documentation=man:systemd-pcrlock(8)
DefaultDependencies=no
Conflicts=shutdown.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=Lock UEFI SecureBoot Authority to TPM2 PCR Policy
Description=Lock UEFI SecureBoot Authority to TPM PCR Policy
Documentation=man:systemd-pcrlock(8)
DefaultDependencies=no
Conflicts=shutdown.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=Lock UEFI SecureBoot Policy to TPM2 PCR Policy
Description=Lock UEFI SecureBoot Policy to TPM PCR Policy
Documentation=man:systemd-pcrlock(8)
DefaultDependencies=no
Conflicts=shutdown.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=Make TPM2 PCR Policy (Varlink)
Description=Make TPM PCR Policy (Varlink)
Documentation=man:systemd-pcrlock(8)
DefaultDependencies=no
After=tpm2.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=Make TPM2 PCR Policy (Varlink)
Description=Make TPM PCR Policy (Varlink)
Documentation=man:systemd-pcrlock(8)
DefaultDependencies=no
Conflicts=shutdown.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=TPM2 PCR Machine ID Measurement
Description=TPM PCR Machine ID Measurement
Documentation=man:systemd-pcrmachine.service(8)
DefaultDependencies=no
Conflicts=shutdown.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=TPM2 PCR Barrier (initrd)
Description=TPM PCR Barrier (initrd)
Documentation=man:systemd-pcrphase-initrd.service(8)
DefaultDependencies=no
Conflicts=shutdown.target initrd-switch-root.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=TPM2 PCR Barrier (Initialization)
Description=TPM PCR Barrier (Initialization)
Documentation=man:systemd-pcrphase-sysinit.service(8)
DefaultDependencies=no
Conflicts=shutdown.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=TPM2 PCR Barrier (User)
Description=TPM PCR Barrier (User)
Documentation=man:systemd-pcrphase.service(8)
After=remote-fs.target remote-cryptsetup.target tpm2.target
Before=systemd-user-sessions.service

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=TPM2 SRK Setup (Early)
Description=Early TPM SRK Setup
Documentation=man:systemd-tpm2-setup.service(8)
DefaultDependencies=no
Conflicts=shutdown.target

View File

@ -8,7 +8,7 @@
# (at your option) any later version.
[Unit]
Description=TPM2 SRK Setup
Description=TPM SRK Setup
Documentation=man:systemd-tpm2-setup.service(8)
DefaultDependencies=no
Conflicts=shutdown.target