From e3dae4e6d11c23371d18a11978acde40deac2835 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 20 Jun 2023 07:23:42 +0200 Subject: [PATCH] tree: Remove Description= from all units If a unit doesn't have a Description option, systemd will use the unit name in messages. I think that is better, because then you don't need to be familiar with the descriptions to mentally map, for example, "MX mount local data filessystems" (sic!) to "mxmount.service" to get from a log message to the unit name which you can use as an argument to `systemctl`or `journalctl`. --- blink/blinkd.service | 1 - checktrust/getty-checktrust.service | 1 - crashkernel/crashkernel.service | 1 - logrotate/logrotate.service | 1 - logrotate/logrotate.timer | 1 - misc_systemd_units/admin-sshd.service | 1 - misc_systemd_units/automount.service | 1 - misc_systemd_units/baucamhttpd.service | 3 --- misc_systemd_units/eturnal.service | 1 - misc_systemd_units/getcams.service | 3 --- misc_systemd_units/mxvlan.service | 1 - misc_systemd_units/network.service | 1 - misc_systemd_units/nfsd.service | 1 - misc_systemd_units/pacbio-sshd.service | 1 - misc_systemd_units/sshd.service | 1 - misc_systemd_units/udev-settled.target | 1 - mkmotd/motd.service | 1 - mxmount/mxmount.service | 1 - mxproxmox/proxmox-backup.service | 3 --- mxproxmox/proxmox-backup.timer | 2 -- mxraid/mxraid.shutdown.service | 1 - mxraid/mxraid.startup.service | 4 ---- nvidiactl/nvidia.service | 1 - serial-log/serial-log@.service | 3 --- 24 files changed, 36 deletions(-) diff --git a/blink/blinkd.service b/blink/blinkd.service index 966b2b1d..c93b5142 100644 --- a/blink/blinkd.service +++ b/blink/blinkd.service @@ -1,5 +1,4 @@ [Unit] -Description=blinkd ConditionHost=!wheatley.molgen.mpg.de ConditionHost=!cerberus.molgen.mpg.de ConditionHost=!welcome.molgen.mpg.de diff --git a/checktrust/getty-checktrust.service b/checktrust/getty-checktrust.service index 2d301e30..5c0765b8 100644 --- a/checktrust/getty-checktrust.service +++ b/checktrust/getty-checktrust.service @@ -1,5 +1,4 @@ [Unit] -Description=Check Mariux64 trust for getty Before=getty@.service [Install] diff --git a/crashkernel/crashkernel.service b/crashkernel/crashkernel.service index 2a2cf4cc..28b17e1b 100644 --- a/crashkernel/crashkernel.service +++ b/crashkernel/crashkernel.service @@ -1,5 +1,4 @@ [Unit] -Description=load crashkernel if enabled Wants=startup-crashmemory.service After=startup-crashmemory.service ConditionPathExists=/node/startup-crashmemory/available diff --git a/logrotate/logrotate.service b/logrotate/logrotate.service index b1c8a7c9..60b41876 100644 --- a/logrotate/logrotate.service +++ b/logrotate/logrotate.service @@ -1,5 +1,4 @@ [Unit] -Description=Rotate log files Documentation=man:logrotate(8) man:logrotate.conf(5) RequiresMountsFor=/var/log ConditionACPower=true diff --git a/logrotate/logrotate.timer b/logrotate/logrotate.timer index ea379318..af88397d 100644 --- a/logrotate/logrotate.timer +++ b/logrotate/logrotate.timer @@ -1,5 +1,4 @@ [Unit] -Description=Daily rotation of log files Documentation=man:logrotate(8) man:logrotate.conf(5) [Timer] diff --git a/misc_systemd_units/admin-sshd.service b/misc_systemd_units/admin-sshd.service index 70d1e8ee..5cd099fb 100644 --- a/misc_systemd_units/admin-sshd.service +++ b/misc_systemd_units/admin-sshd.service @@ -1,5 +1,4 @@ [Unit] -Description=Admin sshd After=network.target ConditionHost=|bka.molgen.mpg.de diff --git a/misc_systemd_units/automount.service b/misc_systemd_units/automount.service index e9d1c4f7..15187462 100644 --- a/misc_systemd_units/automount.service +++ b/misc_systemd_units/automount.service @@ -1,5 +1,4 @@ [Unit] -Description=Automounter Requires=basic.target After=basic.target diff --git a/misc_systemd_units/baucamhttpd.service b/misc_systemd_units/baucamhttpd.service index bed423e5..3bab0f55 100644 --- a/misc_systemd_units/baucamhttpd.service +++ b/misc_systemd_units/baucamhttpd.service @@ -1,6 +1,3 @@ -[Unit] -Description=mxstartup baucamhttpd - [Service] User=zmuser ExecStartPre=/project/baucam/allowhosts.pl diff --git a/misc_systemd_units/eturnal.service b/misc_systemd_units/eturnal.service index e30df3d3..a5b1755d 100644 --- a/misc_systemd_units/eturnal.service +++ b/misc_systemd_units/eturnal.service @@ -1,5 +1,4 @@ [Unit] -Description=eturnal STUN/TURN server Wants=epmd.service After=epmd.service network.target Documentation=https://eturnal.net/documentation/ diff --git a/misc_systemd_units/getcams.service b/misc_systemd_units/getcams.service index b944f0d6..7d1f20ea 100644 --- a/misc_systemd_units/getcams.service +++ b/misc_systemd_units/getcams.service @@ -1,6 +1,3 @@ -[Unit] -Description=mxstartup baucamhttpd - [Service] User=zmuser WorkingDirectory=/project/baucam diff --git a/misc_systemd_units/mxvlan.service b/misc_systemd_units/mxvlan.service index 2d28d49d..bd889a86 100644 --- a/misc_systemd_units/mxvlan.service +++ b/misc_systemd_units/mxvlan.service @@ -1,5 +1,4 @@ [Unit] -Description=MX VLAN Setup Wants=network.service After=network.service Before=network.target diff --git a/misc_systemd_units/network.service b/misc_systemd_units/network.service index 09e2cf7f..fac91273 100644 --- a/misc_systemd_units/network.service +++ b/misc_systemd_units/network.service @@ -1,5 +1,4 @@ [Unit] -Description=Network Connectivity DefaultDependencies=no [Service] diff --git a/misc_systemd_units/nfsd.service b/misc_systemd_units/nfsd.service index 91fa8ca4..403382e2 100644 --- a/misc_systemd_units/nfsd.service +++ b/misc_systemd_units/nfsd.service @@ -1,5 +1,4 @@ [Unit] -Description=NFS Daemon ConditionPathExists=/etc/exports Requires=local-fs.target proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount After=local-fs.target proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount unbound.service mxmount.service diff --git a/misc_systemd_units/pacbio-sshd.service b/misc_systemd_units/pacbio-sshd.service index 69d82c69..08c0eccd 100644 --- a/misc_systemd_units/pacbio-sshd.service +++ b/misc_systemd_units/pacbio-sshd.service @@ -1,5 +1,4 @@ [Unit] -Description=vlan.pacbio auf smrtlink sshd After=network.target ConditionHost=smrtlink.molgen.mpg.de diff --git a/misc_systemd_units/sshd.service b/misc_systemd_units/sshd.service index 375efde7..5b6caed3 100644 --- a/misc_systemd_units/sshd.service +++ b/misc_systemd_units/sshd.service @@ -1,5 +1,4 @@ [Unit] -Description=OpenSSH Secure Shell Service After=syslog.target network.target [Service] diff --git a/misc_systemd_units/udev-settled.target b/misc_systemd_units/udev-settled.target index 1f0ce5d9..05fa0e59 100644 --- a/misc_systemd_units/udev-settled.target +++ b/misc_systemd_units/udev-settled.target @@ -6,7 +6,6 @@ # per DefaultDependencies=yes. [Unit] -Description=udev Settled DefaultDependencies=no Wants=systemd-udev-settle.service After=systemd-udev-settle.service diff --git a/mkmotd/motd.service b/mkmotd/motd.service index 67d6e448..2c55cc42 100644 --- a/mkmotd/motd.service +++ b/mkmotd/motd.service @@ -1,5 +1,4 @@ [Unit] -Description=Make motd After=startup-tags.service [Service] diff --git a/mxmount/mxmount.service b/mxmount/mxmount.service index c5d64aea..e9fa10b9 100644 --- a/mxmount/mxmount.service +++ b/mxmount/mxmount.service @@ -1,5 +1,4 @@ [Unit] -Description=MX mount local data filessystems After=mxraid.startup.service ConditionPathExists=/etc/mxmounts diff --git a/mxproxmox/proxmox-backup.service b/mxproxmox/proxmox-backup.service index f842f4f2..26dd8714 100644 --- a/mxproxmox/proxmox-backup.service +++ b/mxproxmox/proxmox-backup.service @@ -1,6 +1,3 @@ -[Unit] -Description=Proxmox Backup - [Service] Slice=slowio.slice ExecStart=/usr/sbin/slowio PHASE2 /usr/bin/mxproxmox local-backups diff --git a/mxproxmox/proxmox-backup.timer b/mxproxmox/proxmox-backup.timer index 83ff55c5..aa108d8e 100644 --- a/mxproxmox/proxmox-backup.timer +++ b/mxproxmox/proxmox-backup.timer @@ -1,6 +1,4 @@ [Unit] -Description=Daily trigger of promox-backup.service - ConditionHost=!deathofrats.molgen.mpg.de [Timer] diff --git a/mxraid/mxraid.shutdown.service b/mxraid/mxraid.shutdown.service index 218a8418..05871c5d 100644 --- a/mxraid/mxraid.shutdown.service +++ b/mxraid/mxraid.shutdown.service @@ -1,5 +1,4 @@ [Unit] -Description=MX disassemble local software raids After=lazy-umount-nfs.service DefaultDependencies=false diff --git a/mxraid/mxraid.startup.service b/mxraid/mxraid.startup.service index 6e799b9c..5971bc03 100644 --- a/mxraid/mxraid.startup.service +++ b/mxraid/mxraid.startup.service @@ -1,7 +1,3 @@ -[Unit] -Description=MX assemble local software raids -# ConditionPathExists=/etc/mdadmconf_db - [Service] Type=oneshot RemainAfterExit=yes diff --git a/nvidiactl/nvidia.service b/nvidiactl/nvidia.service index 3b7a8fd8..b6b96d53 100644 --- a/nvidiactl/nvidia.service +++ b/nvidiactl/nvidia.service @@ -1,5 +1,4 @@ [Unit] -Description=NVIDIA Kernel Driver Before=gdm.service [Service] diff --git a/serial-log/serial-log@.service b/serial-log/serial-log@.service index 917907c7..c8feee89 100644 --- a/serial-log/serial-log@.service +++ b/serial-log/serial-log@.service @@ -1,6 +1,3 @@ -[Unit] -Description=TTY logger - [Service] ExecStart=/usr/libexec/serial-log %I Type=simple