From c47dd353c0fba75af374a4e9a4e1ab9bc7323ba1 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 20 Jun 2023 12:22:10 +0200 Subject: [PATCH] tree: Remove dependencies on network.service or network.target In the previous commit we made basic.target wait for network-online.target. Individual services no longer need to specify a requirement or an order after network.target or network.service becaues they think they need network. --- clusterd/clusterd.service | 4 ---- misc_systemd_units/admin-sshd.service | 2 -- misc_systemd_units/eturnal.service | 2 +- misc_systemd_units/named.service | 2 +- misc_systemd_units/pacbio-sshd.service | 2 -- misc_systemd_units/reboot-notify.service | 4 ---- misc_systemd_units/sshd.service | 2 +- misc_systemd_units/unbound.service | 2 +- misc_systemd_units/xaruba.service | 2 -- mxshadow/mxshadow.service | 3 +-- netlog/netlog.service | 4 ---- 11 files changed, 5 insertions(+), 24 deletions(-) diff --git a/clusterd/clusterd.service b/clusterd/clusterd.service index c5566ef..99125df 100644 --- a/clusterd/clusterd.service +++ b/clusterd/clusterd.service @@ -1,7 +1,3 @@ -[Unit] -Requires=network.target -After=network.target - [Service] ExecStart=/usr/sbin/clusterd --daemon Restart=always diff --git a/misc_systemd_units/admin-sshd.service b/misc_systemd_units/admin-sshd.service index c1e6fb3..70e5c56 100644 --- a/misc_systemd_units/admin-sshd.service +++ b/misc_systemd_units/admin-sshd.service @@ -1,7 +1,5 @@ [Unit] -After=network.target - ConditionHost=|bka.molgen.mpg.de [Service] diff --git a/misc_systemd_units/eturnal.service b/misc_systemd_units/eturnal.service index 304d48a..c432e04 100644 --- a/misc_systemd_units/eturnal.service +++ b/misc_systemd_units/eturnal.service @@ -1,7 +1,7 @@ [Unit] Wants=epmd.service -After=epmd.service network.target +After=epmd.service Documentation=https://eturnal.net/documentation/ Documentation=https://github.com/processone/eturnal/blob/1.4.1/README.md Documentation=https://github.com/processone/eturnal/blob/1.4.1/CHANGELOG.md diff --git a/misc_systemd_units/named.service b/misc_systemd_units/named.service index edc7a81..2f9b245 100644 --- a/misc_systemd_units/named.service +++ b/misc_systemd_units/named.service @@ -1,5 +1,5 @@ [Unit] -After=network.service gateway.service mxmount.service automount.service +After=gateway.service mxmount.service automount.service Before=mxstartup-mxvip.service ConditionHost=wtf.molgen.mpg.de diff --git a/misc_systemd_units/pacbio-sshd.service b/misc_systemd_units/pacbio-sshd.service index 245c075..aa952a4 100644 --- a/misc_systemd_units/pacbio-sshd.service +++ b/misc_systemd_units/pacbio-sshd.service @@ -1,7 +1,5 @@ [Unit] -After=network.target - ConditionHost=smrtlink.molgen.mpg.de [Service] diff --git a/misc_systemd_units/reboot-notify.service b/misc_systemd_units/reboot-notify.service index 66c1270..1f200fc 100644 --- a/misc_systemd_units/reboot-notify.service +++ b/misc_systemd_units/reboot-notify.service @@ -1,7 +1,3 @@ -[Unit] -Requires=network.target -After=network.target - [Service] Type=oneshot RemainAfterExit=yes diff --git a/misc_systemd_units/sshd.service b/misc_systemd_units/sshd.service index b031e48..9bd6496 100644 --- a/misc_systemd_units/sshd.service +++ b/misc_systemd_units/sshd.service @@ -1,6 +1,6 @@ [Unit] -After=syslog.target network.target +After=syslog.target [Service] EnvironmentFile=/etc/local/mxhost.conf diff --git a/misc_systemd_units/unbound.service b/misc_systemd_units/unbound.service index b03d713..ad270f5 100644 --- a/misc_systemd_units/unbound.service +++ b/misc_systemd_units/unbound.service @@ -1,5 +1,5 @@ [Unit] -After=network.service gateway.service +After=gateway.service [Service] Type=forking diff --git a/misc_systemd_units/xaruba.service b/misc_systemd_units/xaruba.service index 67c456e..431465a 100644 --- a/misc_systemd_units/xaruba.service +++ b/misc_systemd_units/xaruba.service @@ -1,6 +1,4 @@ [Unit] -After=network.service gateway.service mxmount.service -Before=network.target ConditionHost=macheteinfach.molgen.mpg.de diff --git a/mxshadow/mxshadow.service b/mxshadow/mxshadow.service index f72505e..6f84be8 100644 --- a/mxshadow/mxshadow.service +++ b/mxshadow/mxshadow.service @@ -1,6 +1,5 @@ [Unit] -Requires=network.target -After=network.target + ConditionHost=wtf.molgen.mpg.de [Service] diff --git a/netlog/netlog.service b/netlog/netlog.service index 56b7061..0873228 100644 --- a/netlog/netlog.service +++ b/netlog/netlog.service @@ -1,7 +1,3 @@ -[Unit] -Requires=network.target -After=network.target - [Service] ExecStart=/usr/sbin/netlog --daemon /var/log/messages /var/log/mail.log Restart=always