From 67bade192014ffadf4b887c9e3b25a297b94285f 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 | 2 +- checktrust/getty-checktrust.service | 2 +- crashkernel/crashkernel.service | 2 +- logrotate/logrotate.service | 2 +- logrotate/logrotate.timer | 2 +- misc_systemd_units/admin-sshd.service | 2 +- misc_systemd_units/automount.service | 2 +- misc_systemd_units/baucamhttpd.service | 3 --- misc_systemd_units/eturnal.service | 2 +- misc_systemd_units/getcams.service | 3 --- misc_systemd_units/mxvlan.service | 2 +- misc_systemd_units/network.service | 2 +- misc_systemd_units/nfsd.service | 2 +- misc_systemd_units/pacbio-sshd.service | 2 +- misc_systemd_units/sshd.service | 2 +- misc_systemd_units/udev-settled.target | 2 +- mkmotd/motd.service | 3 --- mxmount/mxmount.service | 2 +- mxproxmox/proxmox-backup.service | 3 --- mxproxmox/proxmox-backup.timer | 1 - mxraid/mxraid.shutdown.service | 2 +- mxraid/mxraid.startup.service | 2 +- nvidiactl/nvidia.service | 2 +- serial-log/serial-log@.service | 3 --- 24 files changed, 18 insertions(+), 34 deletions(-) diff --git a/blink/blinkd.service b/blink/blinkd.service index 966b2b1d..48ca6551 100644 --- a/blink/blinkd.service +++ b/blink/blinkd.service @@ -1,5 +1,5 @@ [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..b6b9fb71 100644 --- a/checktrust/getty-checktrust.service +++ b/checktrust/getty-checktrust.service @@ -1,5 +1,5 @@ [Unit] -Description=Check Mariux64 trust for getty + Before=getty@.service [Install] diff --git a/crashkernel/crashkernel.service b/crashkernel/crashkernel.service index 2a2cf4cc..02c27fb6 100644 --- a/crashkernel/crashkernel.service +++ b/crashkernel/crashkernel.service @@ -1,5 +1,5 @@ [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..8e7b74a9 100644 --- a/logrotate/logrotate.service +++ b/logrotate/logrotate.service @@ -1,5 +1,5 @@ [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..4375c08c 100644 --- a/logrotate/logrotate.timer +++ b/logrotate/logrotate.timer @@ -1,5 +1,5 @@ [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..c1e6fb3f 100644 --- a/misc_systemd_units/admin-sshd.service +++ b/misc_systemd_units/admin-sshd.service @@ -1,5 +1,5 @@ [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..b7218a26 100644 --- a/misc_systemd_units/automount.service +++ b/misc_systemd_units/automount.service @@ -1,5 +1,5 @@ [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..304d48a1 100644 --- a/misc_systemd_units/eturnal.service +++ b/misc_systemd_units/eturnal.service @@ -1,5 +1,5 @@ [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..5459a4ce 100644 --- a/misc_systemd_units/mxvlan.service +++ b/misc_systemd_units/mxvlan.service @@ -1,5 +1,5 @@ [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..79b8c1d2 100644 --- a/misc_systemd_units/network.service +++ b/misc_systemd_units/network.service @@ -1,5 +1,5 @@ [Unit] -Description=Network Connectivity + DefaultDependencies=no [Service] diff --git a/misc_systemd_units/nfsd.service b/misc_systemd_units/nfsd.service index 91fa8ca4..bd895e4c 100644 --- a/misc_systemd_units/nfsd.service +++ b/misc_systemd_units/nfsd.service @@ -1,5 +1,5 @@ [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..245c0759 100644 --- a/misc_systemd_units/pacbio-sshd.service +++ b/misc_systemd_units/pacbio-sshd.service @@ -1,5 +1,5 @@ [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..b031e482 100644 --- a/misc_systemd_units/sshd.service +++ b/misc_systemd_units/sshd.service @@ -1,5 +1,5 @@ [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..f6f9fe13 100644 --- a/misc_systemd_units/udev-settled.target +++ b/misc_systemd_units/udev-settled.target @@ -6,7 +6,7 @@ # 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 2d574a63..51b997d1 100644 --- a/mkmotd/motd.service +++ b/mkmotd/motd.service @@ -1,6 +1,3 @@ -[Unit] -Description=Make motd - [Service] Type=oneshot ExecStart=/usr/sbin/mkmotd.pl diff --git a/mxmount/mxmount.service b/mxmount/mxmount.service index c5d64aea..1b03df78 100644 --- a/mxmount/mxmount.service +++ b/mxmount/mxmount.service @@ -1,5 +1,5 @@ [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..c93b5ce6 100644 --- a/mxproxmox/proxmox-backup.timer +++ b/mxproxmox/proxmox-backup.timer @@ -1,5 +1,4 @@ [Unit] -Description=Daily trigger of promox-backup.service ConditionHost=!deathofrats.molgen.mpg.de diff --git a/mxraid/mxraid.shutdown.service b/mxraid/mxraid.shutdown.service index 218a8418..91a9a67d 100644 --- a/mxraid/mxraid.shutdown.service +++ b/mxraid/mxraid.shutdown.service @@ -1,5 +1,5 @@ [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..e89aa8f0 100644 --- a/mxraid/mxraid.startup.service +++ b/mxraid/mxraid.startup.service @@ -1,5 +1,5 @@ [Unit] -Description=MX assemble local software raids + # ConditionPathExists=/etc/mdadmconf_db [Service] diff --git a/nvidiactl/nvidia.service b/nvidiactl/nvidia.service index 3b7a8fd8..4045db2e 100644 --- a/nvidiactl/nvidia.service +++ b/nvidiactl/nvidia.service @@ -1,5 +1,5 @@ [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