From 3719dcb0bc456f86fe571dcbb83c0fc5cffe6f5a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 13 Mar 2024 22:18:13 +0100 Subject: [PATCH] =?utf8?q?units:=20retitle=20systemd-pcrextend.{service,so?= =?utf8?q?cket},=20change=20TPM2=E2=86=92TPM?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. --- units/systemd-pcrextend.socket | 2 +- units/systemd-pcrextend@.service.in | 2 +- units/systemd-pcrfs-root.service.in | 2 +- units/systemd-pcrfs@.service.in | 2 +- units/systemd-pcrlock-file-system.service.in | 2 +- units/systemd-pcrlock-firmware-code.service.in | 2 +- units/systemd-pcrlock-firmware-config.service.in | 2 +- units/systemd-pcrlock-machine-id.service.in | 2 +- units/systemd-pcrlock-make-policy.service.in | 2 +- units/systemd-pcrlock-secureboot-authority.service.in | 2 +- units/systemd-pcrlock-secureboot-policy.service.in | 2 +- units/systemd-pcrlock.socket | 2 +- units/systemd-pcrlock@.service.in | 2 +- units/systemd-pcrmachine.service.in | 2 +- units/systemd-pcrphase-initrd.service.in | 2 +- units/systemd-pcrphase-sysinit.service.in | 2 +- units/systemd-pcrphase.service.in | 2 +- units/systemd-tpm2-setup-early.service.in | 2 +- units/systemd-tpm2-setup.service.in | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/units/systemd-pcrextend.socket b/units/systemd-pcrextend.socket index 41db50acd8..4f74748125 100644 --- a/units/systemd-pcrextend.socket +++ b/units/systemd-pcrextend.socket @@ -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 diff --git a/units/systemd-pcrextend@.service.in b/units/systemd-pcrextend@.service.in index 6020a21c40..68b71d4068 100644 --- a/units/systemd-pcrextend@.service.in +++ b/units/systemd-pcrextend@.service.in @@ -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 diff --git a/units/systemd-pcrfs-root.service.in b/units/systemd-pcrfs-root.service.in index 582e1d83e5..5b40a91ca6 100644 --- a/units/systemd-pcrfs-root.service.in +++ b/units/systemd-pcrfs-root.service.in @@ -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 diff --git a/units/systemd-pcrfs@.service.in b/units/systemd-pcrfs@.service.in index 262a82fb04..203d7b9782 100644 --- a/units/systemd-pcrfs@.service.in +++ b/units/systemd-pcrfs@.service.in @@ -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 diff --git a/units/systemd-pcrlock-file-system.service.in b/units/systemd-pcrlock-file-system.service.in index dd0d358793..807ebc29f2 100644 --- a/units/systemd-pcrlock-file-system.service.in +++ b/units/systemd-pcrlock-file-system.service.in @@ -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 diff --git a/units/systemd-pcrlock-firmware-code.service.in b/units/systemd-pcrlock-firmware-code.service.in index b271671393..cae8179bbf 100644 --- a/units/systemd-pcrlock-firmware-code.service.in +++ b/units/systemd-pcrlock-firmware-code.service.in @@ -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 diff --git a/units/systemd-pcrlock-firmware-config.service.in b/units/systemd-pcrlock-firmware-config.service.in index 8440f5982b..74845044a2 100644 --- a/units/systemd-pcrlock-firmware-config.service.in +++ b/units/systemd-pcrlock-firmware-config.service.in @@ -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 diff --git a/units/systemd-pcrlock-machine-id.service.in b/units/systemd-pcrlock-machine-id.service.in index 16c6a99251..c82c358149 100644 --- a/units/systemd-pcrlock-machine-id.service.in +++ b/units/systemd-pcrlock-machine-id.service.in @@ -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 diff --git a/units/systemd-pcrlock-make-policy.service.in b/units/systemd-pcrlock-make-policy.service.in index 444e1e49f1..4dd18ec009 100644 --- a/units/systemd-pcrlock-make-policy.service.in +++ b/units/systemd-pcrlock-make-policy.service.in @@ -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 diff --git a/units/systemd-pcrlock-secureboot-authority.service.in b/units/systemd-pcrlock-secureboot-authority.service.in index d5c722cf31..9f6c1a4ef4 100644 --- a/units/systemd-pcrlock-secureboot-authority.service.in +++ b/units/systemd-pcrlock-secureboot-authority.service.in @@ -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 diff --git a/units/systemd-pcrlock-secureboot-policy.service.in b/units/systemd-pcrlock-secureboot-policy.service.in index fc50e17aaa..0975aca5a2 100644 --- a/units/systemd-pcrlock-secureboot-policy.service.in +++ b/units/systemd-pcrlock-secureboot-policy.service.in @@ -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 diff --git a/units/systemd-pcrlock.socket b/units/systemd-pcrlock.socket index 21431478b8..4fbe2a5f24 100644 --- a/units/systemd-pcrlock.socket +++ b/units/systemd-pcrlock.socket @@ -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 diff --git a/units/systemd-pcrlock@.service.in b/units/systemd-pcrlock@.service.in index 50a0a3de8e..5ee567ce5a 100644 --- a/units/systemd-pcrlock@.service.in +++ b/units/systemd-pcrlock@.service.in @@ -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 diff --git a/units/systemd-pcrmachine.service.in b/units/systemd-pcrmachine.service.in index cbd1005104..65caf2ed49 100644 --- a/units/systemd-pcrmachine.service.in +++ b/units/systemd-pcrmachine.service.in @@ -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 diff --git a/units/systemd-pcrphase-initrd.service.in b/units/systemd-pcrphase-initrd.service.in index 3b18b4f29d..6fcf94de76 100644 --- a/units/systemd-pcrphase-initrd.service.in +++ b/units/systemd-pcrphase-initrd.service.in @@ -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 diff --git a/units/systemd-pcrphase-sysinit.service.in b/units/systemd-pcrphase-sysinit.service.in index d938e02401..8c0c0c82a2 100644 --- a/units/systemd-pcrphase-sysinit.service.in +++ b/units/systemd-pcrphase-sysinit.service.in @@ -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 diff --git a/units/systemd-pcrphase.service.in b/units/systemd-pcrphase.service.in index 26b9e5c538..04ace12e14 100644 --- a/units/systemd-pcrphase.service.in +++ b/units/systemd-pcrphase.service.in @@ -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 diff --git a/units/systemd-tpm2-setup-early.service.in b/units/systemd-tpm2-setup-early.service.in index 628f816678..2b0f8979ac 100644 --- a/units/systemd-tpm2-setup-early.service.in +++ b/units/systemd-tpm2-setup-early.service.in @@ -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 diff --git a/units/systemd-tpm2-setup.service.in b/units/systemd-tpm2-setup.service.in index 4830afa243..cf34d9ab66 100644 --- a/units/systemd-tpm2-setup.service.in +++ b/units/systemd-tpm2-setup.service.in @@ -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 -- 2.25.1