From 3719dcb0bc456f86fe571dcbb83c0fc5cffe6f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 13 Mar 2024 22:18:13 +0100
Subject: [PATCH 1/5] =?UTF-8?q?units:=20retitle=20systemd-pcrextend.{servi?=
 =?UTF-8?q?ce,socket},=20change=20TPM2=E2=86=92TPM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
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 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

From 4fd9ed3e413f292d953bacd1b67794f5233dbc54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 13 Mar 2024 22:34:49 +0100
Subject: [PATCH 2/5] units/systemd-machine-id-commit: retitle

Our docs say that the Description should be capitalized.
Also, change "commit" to "save" to make this more accessible.
---
 units/systemd-machine-id-commit.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/units/systemd-machine-id-commit.service b/units/systemd-machine-id-commit.service
index 0ad6cf3ab01..97b9186f3b0 100644
--- a/units/systemd-machine-id-commit.service
+++ b/units/systemd-machine-id-commit.service
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Commit a transient machine-id on disk
+Description=Save Transient machine-id to Disk
 Documentation=man:systemd-machine-id-commit.service(8)
 DefaultDependencies=no
 Conflicts=shutdown.target

From 3986aa6d08c967a5b93c5bcd73755674c53bb5d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 14 Mar 2024 10:16:25 +0100
Subject: [PATCH 3/5] units: drop "(Varlink)"

We generally don't specify the protocol implementation in unit descriptions.

For journald, we have:
  $ git grep Description 'units/*journald*'
  units/systemd-journald-audit.socket:Description=Journal Audit Socket
  units/systemd-journald-dev-log.socket:Description=Journal Socket (/dev/log)
  units/systemd-journald-varlink@.socket:Description=Journal Varlink Socket for Namespace %i
  units/systemd-journald.service.in:Description=Journal Service
  units/systemd-journald.socket:Description=Journal Sockets
  units/systemd-journald@.service.in:Description=Journal Service for Namespace %i
  units/systemd-journald@.socket:Description=Journal Sockets for Namespace %i
so we need to keep "Varlink" in the name. But also use "Sockets" (plural)
for the "main" socket unit, since it opens multiple sockets.
---
 units/systemd-bootctl.socket      | 2 +-
 units/systemd-bootctl@.service.in | 2 +-
 units/systemd-creds.socket        | 2 +-
 units/systemd-creds@.service      | 2 +-
 units/systemd-hostnamed.socket    | 2 +-
 units/systemd-journald.socket     | 2 +-
 units/systemd-journald@.socket    | 2 +-
 units/systemd-pcrlock.socket      | 2 +-
 units/systemd-pcrlock@.service.in | 2 +-
 units/systemd-sysext.socket       | 2 +-
 units/systemd-sysext@.service     | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/units/systemd-bootctl.socket b/units/systemd-bootctl.socket
index 2b26d7edac0..bfc64358a61 100644
--- a/units/systemd-bootctl.socket
+++ b/units/systemd-bootctl.socket
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Boot Control (Varlink)
+Description=Boot Control
 Documentation=man:bootctl(1)
 DefaultDependencies=no
 After=local-fs.target
diff --git a/units/systemd-bootctl@.service.in b/units/systemd-bootctl@.service.in
index d1c3deddfd7..5ca889bfabc 100644
--- a/units/systemd-bootctl@.service.in
+++ b/units/systemd-bootctl@.service.in
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Boot Control (Varlink)
+Description=Boot Control
 Documentation=man:bootctl(1)
 DefaultDependencies=no
 Conflicts=shutdown.target
diff --git a/units/systemd-creds.socket b/units/systemd-creds.socket
index 0f89b39c3e4..bf13c11e0fa 100644
--- a/units/systemd-creds.socket
+++ b/units/systemd-creds.socket
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Credential Encryption/Decryption (Varlink)
+Description=Credential Encryption/Decryption
 Documentation=man:systemd-creds(1)
 DefaultDependencies=no
 Before=sockets.target
diff --git a/units/systemd-creds@.service b/units/systemd-creds@.service
index 37cdd319f64..d565836d3ad 100644
--- a/units/systemd-creds@.service
+++ b/units/systemd-creds@.service
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Credential Encryption/Decryption (Varlink)
+Description=Credential Encryption/Decryption
 Documentation=man:systemd-creds(1)
 DefaultDependencies=no
 Conflicts=shutdown.target initrd-switch-root.target
diff --git a/units/systemd-hostnamed.socket b/units/systemd-hostnamed.socket
index 8d0a06c5f27..2a2cfce6531 100644
--- a/units/systemd-hostnamed.socket
+++ b/units/systemd-hostnamed.socket
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Hostname Service Varlink Socket
+Description=Hostname Service Socket
 Documentation=man:systemd-hostnamed.service(8)
 Documentation=man:hostname(5)
 Documentation=man:machine-info(5)
diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket
index 1e2178e8fdf..e2ffb96bfc6 100644
--- a/units/systemd-journald.socket
+++ b/units/systemd-journald.socket
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Journal Socket
+Description=Journal Sockets
 Documentation=man:systemd-journald.service(8) man:journald.conf(5)
 DefaultDependencies=no
 Before=sockets.target
diff --git a/units/systemd-journald@.socket b/units/systemd-journald@.socket
index 60c025fcc3b..bd686b5f69d 100644
--- a/units/systemd-journald@.socket
+++ b/units/systemd-journald@.socket
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Journal Socket for Namespace %i
+Description=Journal Sockets for Namespace %i
 Documentation=man:systemd-journald.service(8) man:journald.conf(5)
 StopWhenUnneeded=yes
 
diff --git a/units/systemd-pcrlock.socket b/units/systemd-pcrlock.socket
index 4fbe2a5f242..17a56f7eb3e 100644
--- a/units/systemd-pcrlock.socket
+++ b/units/systemd-pcrlock.socket
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Make TPM PCR Policy (Varlink)
+Description=Make TPM PCR Policy
 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 5ee567ce5a8..3528c565c8a 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 TPM PCR Policy (Varlink)
+Description=Make TPM PCR Policy
 Documentation=man:systemd-pcrlock(8)
 DefaultDependencies=no
 Conflicts=shutdown.target
diff --git a/units/systemd-sysext.socket b/units/systemd-sysext.socket
index 1a616ca69ca..78475cf1967 100644
--- a/units/systemd-sysext.socket
+++ b/units/systemd-sysext.socket
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=System Extension Image Management (Varlink)
+Description=System Extension Image Management
 Documentation=man:systemd-sysext(8)
 DefaultDependencies=no
 After=local-fs.target
diff --git a/units/systemd-sysext@.service b/units/systemd-sysext@.service
index 544e22fe042..9dcbf9f1dd8 100644
--- a/units/systemd-sysext@.service
+++ b/units/systemd-sysext@.service
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=System Extension Image Management (Varlink)
+Description=System Extension Image Management
 Documentation=man:systemd-sysext(8)
 DefaultDependencies=no
 After=local-fs.target

From 25e98e331dcbdf89cb5554dc9ba4d34452a135d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 14 Mar 2024 10:18:58 +0100
Subject: [PATCH 4/5] units: retitle systemd-bootctl*.{service,socket}
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"Starting Boot Control…" would be a fairly confusing message in the boot logs.
Use "… Service" to mirror what we have in other services like
systemd-{hostnamed,timedated,portabled,machined,…}.service.
---
 units/systemd-bootctl.socket      | 2 +-
 units/systemd-bootctl@.service.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/units/systemd-bootctl.socket b/units/systemd-bootctl.socket
index bfc64358a61..59151ba161c 100644
--- a/units/systemd-bootctl.socket
+++ b/units/systemd-bootctl.socket
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Boot Control
+Description=Boot Entries Service Socket
 Documentation=man:bootctl(1)
 DefaultDependencies=no
 After=local-fs.target
diff --git a/units/systemd-bootctl@.service.in b/units/systemd-bootctl@.service.in
index 5ca889bfabc..73175f1a93d 100644
--- a/units/systemd-bootctl@.service.in
+++ b/units/systemd-bootctl@.service.in
@@ -8,7 +8,7 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Boot Control
+Description=Boot Entries Service
 Documentation=man:bootctl(1)
 DefaultDependencies=no
 Conflicts=shutdown.target

From a954b427e9c53e4192eae3e72f64e05721e17a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 14 Mar 2024 08:53:55 +0100
Subject: [PATCH 5/5] src/partition: remove unnecessary uses of "make sure"

---
 src/partition/repart.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/partition/repart.c b/src/partition/repart.c
index adf1f0e6965..ddb7fcb046d 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -3329,8 +3329,8 @@ static int context_dump(Context *context, bool late) {
         if (r < 0)
                 return r;
 
-        /* Make sure we only write the partition bar once, even if we're writing the partition table twice to
-         * communicate roothashes. */
+        /* Only write the partition bar once, even if we're writing the partition table twice to communicate
+         * roothashes. */
         if (FLAGS_SET(arg_json_format_flags, JSON_FORMAT_OFF) && !late) {
                 putc('\n', stdout);
 
@@ -4239,7 +4239,7 @@ static int partition_format_verity_hash(
         if (PARTITION_EXISTS(p)) /* Never format existing partitions */
                 return 0;
 
-        /* Minimized partitions will use the copy blocks logic so let's make sure to skip those here. */
+        /* Minimized partitions will use the copy blocks logic so skip those here. */
         if (p->copy_blocks_fd >= 0)
                 return 0;
 
@@ -4986,7 +4986,7 @@ static int context_mkfs(Context *context) {
                 if (!p->format)
                         continue;
 
-                /* Minimized partitions will use the copy blocks logic so let's make sure to skip those here. */
+                /* Minimized partitions will use the copy blocks logic so skip those here. */
                 if (p->copy_blocks_fd >= 0)
                         continue;
 
@@ -4997,7 +4997,7 @@ static int context_mkfs(Context *context) {
                 assert(p->new_size != UINT64_MAX);
                 assert(p->new_size >= (p->encrypt != ENCRYPT_OFF ? LUKS2_METADATA_KEEP_FREE : 0));
 
-                /* If we're doing encryption, we make sure we keep free space at the end which is required
+                /* If we're doing encryption, keep free space at the end which is required
                  * for cryptsetup's offline encryption. */
                 r = partition_target_prepare(context, p,
                                              p->new_size - (p->encrypt != ENCRYPT_OFF ? LUKS2_METADATA_KEEP_FREE : 0),
@@ -5046,8 +5046,8 @@ static int context_mkfs(Context *context) {
                         return r;
 
                 /* The mkfs binary we invoked might have removed our temporary file when we're not operating
-                 * on a loop device, so let's make sure we open the file again to make sure our file
-                 * descriptor points to any potential new file. */
+                 * on a loop device, so open the file again to make sure our file descriptor points to actual
+                 * new file. */
 
                 if (t->fd >= 0 && t->path && !t->loop) {
                         safe_close(t->fd);