From 3986aa6d08c967a5b93c5bcd73755674c53bb5d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 14 Mar 2024 10:16:25 +0100 Subject: [PATCH] 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