From: Zbigniew Jędrzejewski-Szmek Date: Wed, 13 Mar 2024 21:18:13 +0000 (+0100) Subject: units: retitle systemd-pcrextend.{service,socket}, change TPM2→TPM X-Git-Tag: v256-rc1~509^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3719dcb0bc456f86fe571dcbb83c0fc5cffe6f5a;p=thirdparty%2Fsystemd.git 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. --- diff --git a/units/systemd-pcrextend.socket b/units/systemd-pcrextend.socket index 41db50acd88..4f747481254 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 6020a21c40c..68b71d40687 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 582e1d83e50..5b40a91ca64 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 262a82fb04c..203d7b9782e 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 dd0d358793f..807ebc29f26 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 b2716713939..cae8179bbfc 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 8440f5982b9..74845044a2a 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 16c6a99251f..c82c358149a 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 444e1e49f11..4dd18ec0097 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 d5c722cf311..9f6c1a4ef42 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 fc50e17aaa5..0975aca5a26 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 21431478b88..4fbe2a5f242 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 50a0a3de8eb..5ee567ce5a8 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 cbd1005104f..65caf2ed492 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 3b18b4f29d6..6fcf94de76c 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 d938e02401b..8c0c0c82a2c 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 26b9e5c5389..04ace12e14d 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 628f8166782..2b0f8979ac3 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 4830afa2435..cf34d9ab669 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