Merge pull request #328 from mariux64/cleanup-startup-tags

Clean up startup
mariux64 · Jul 4, 2023 · e8df106 · e8df106
2 parents f92092f + f1476fa
commit e8df106
Show file tree

Hide file tree

Showing 52 changed files with 844 additions and 289 deletions.
diff --git 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
@@ -1,11 +1,13 @@
 [Unit]
-Description=Check Mariux64 trust for getty
-Before=getty@.service
-
-[Install]
-WantedBy=getty@.service
+Wants=getty-pre.target
+Before=getty-pre.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=oneshot
 ExecStart=/usr/libexec/getty-checktrust
 RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git 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/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/install.sh b/install.sh
@@ -125,7 +125,6 @@ install_data misc_systemd_units/enable_overcommit_memory.service "$DESTDIR$syste
 install_data misc_systemd_units/startup-tags.service     "$DESTDIR$systemdunitdir/startup-tags.service"
 install_data misc_systemd_units/unbound.service          "$DESTDIR$systemdunitdir/unbound.service"
 install_exec misc_systemd_units/unbound-startup          "$DESTDIR$usr_sbindir/unbound-startup"
-install_data misc_systemd_units/xaruba.service           "$DESTDIR$systemdunitdir/xaruba.service"
 install_exec mkmotd/mkmotd.pl                            "$DESTDIR$usr_sbindir/mkmotd.pl"
 install_data mkmotd/motd.service                         "$DESTDIR$systemdunitdir/motd.service"
 install_exec mxgrub/mxgrub                               "$DESTDIR$usr_sbindir/mxgrub"
@@ -146,13 +145,12 @@ install_exec pkgadmin/pkgadmin                           "$DESTDIR$usr_sbindir/p
 install_cron pkgadmin/crond-pkgadmin-update              "$DESTDIR$crond_dir/pkgadmin-update"
 install_exec mxraid/mxraid                               "$DESTDIR$usr_sbindir/mxraid"
 install_exec mxraid/mxraid_assemble                      "$DESTDIR$usr_sbindir/mxraid_assemble"
-install_data mxraid/mxraid.startup.service               "$DESTDIR$systemdunitdir/mxraid.startup.service"
+install_data mxraid/mxraid.service                       "$DESTDIR$systemdunitdir/mxraid.service"
 install_data mxraid/mxraid.shutdown.service              "$DESTDIR$systemdunitdir/mxraid.shutdown.service"
 install_exec mxraid/mdcheck.safe                         "$DESTDIR$usr_bindir/mdcheck.safe"
 install_cron mxraid/crond-mdcheck                        "$DESTDIR$crond_dir/mdcheck"
 install_exec kvm_monitor/kvm_monitor.pl                  "$DESTDIR$udev_helperdir/kvm_monitor.pl"
 install_data kvm_monitor/51-raritan-kvm.rules            "$DESTDIR$udev_rulesdir/51-raritan-kvm.rules"
-install_data misc_systemd_units/udev-settled.target      "$DESTDIR$systemdunitdir/udev-settled.target"
 install_exec mxmirror/mxmirror                           "$DESTDIR$usr_sbindir/mxmirror"
 install_data misc_systemd_units/named.service            "$DESTDIR$systemdunitdir/named.service"
 install_data misc_systemd_units/baucamhttpd.service      "$DESTDIR$systemdunitdir/baucamhttpd.service"
@@ -243,8 +241,6 @@ install_data misc_etc_files/udev/rules.d/10-ioschedulers.rules \
 install_data slowio/slowio.slice                          "$DESTDIR$systemdunitdir/slowio.slice"
 install_exec slowio/slowio-mem-control                    "$DESTDIR$sysconfdir/systemd/system-generators/slowio-mem-control"
 install_exec slowio/slowio                                "$DESTDIR$usr_sbindir/slowio"
-install_data misc_systemd_units/fix-lpp.service           "$DESTDIR$systemdunitdir/fix-lpp.service"
-install_data misc_systemd_units/fix-uring.service         "$DESTDIR$systemdunitdir/fix-uring.service"
 install_exec misc_etc_files/mxq/gpu-policy                "$DESTDIR$sysconfdir/mxq/gpu-policy"
 install_data misc_etc_files/os-release                    "$DESTDIR$sysconfdir/os-release"
 install_exec forensics/forensics                          "$DESTDIR$usr_sbindir/forensics"
@@ -265,6 +261,18 @@ install_data misc_etc_files/request-key.d/id_resolver.conf \
                                                           "$DESTDIR$sysconfdir/request-key.d/id_resolver.conf"
 install_symlink /etc/local/access.conf                    "$DESTDIR$sysconfdir/security/access.conf"
 install_data misc_etc_files/cups/client.conf              "$DESTDIR$sysconfdir/cups/client.conf"
+install_data misc_systemd_units/ip6.service               "$DESTDIR$systemdunitdir/ip6.service"
+install_data mxrouter/mxrouter.service                    "$DESTDIR$systemdunitdir/mxrouter.service"
+install_data misc_systemd_units/wait-network-online.service \
+                                                          "$DESTDIR$systemdunitdir/wait-network-online.service"
+install_data misc_etc_files/modprobe.d/disable-i915.conf  "$DESTDIR$sysconfdir/modprobe.d/disable-i915.conf"
+install_data misc_systemd_units/i915.service              "$DESTDIR$systemdunitdir/i915.service"
+install_exec mxstartup/mxservicectl                       "$DESTDIR$usr_sbindir/mxservicectl"
+install_exec mxstartup/mxstartup2mxconfig                 "$DESTDIR$usr_sbindir/mxstartup2mxconfig"
+install_exec mxstartup/mxstartupctl                       "$DESTDIR$usr_sbindir/mxstartupctl"
+install_exec mxstartup/mxvipctl                           "$DESTDIR$usr_sbindir/mxvipctl"
+install_data mxstartup/mxstartup.service                  "$DESTDIR$systemdunitdir/mxstartup.service"
+install_data misc_systemd_units/lightdm.service           "$DESTDIR$systemdunitdir/lightdm.service"
 
 postinstall
 exit
diff --git 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
@@ -1,5 +1,4 @@
 [Unit]
-Description=Daily rotation of log files
 Documentation=man:logrotate(8) man:logrotate.conf(5)
 
 [Timer]

diff --git a/misc_etc_files/modprobe.d/disable-i915.conf b/misc_etc_files/modprobe.d/disable-i915.conf
@@ -0,0 +1,11 @@
+# Disable autoloading of i915 driver so that the console output is
+# not destroyed during boot for systems with the monitor on an nvidia card.
+# Loading the i915 driver seems to disable the console output to the
+# nvida card, possibly switching it to the intel card.
+#
+# When the console is free, we probe the driver manually, so we can use its other
+# functionalities like audio.
+#
+# For yet unknown reasons, `blacklist i915` does not work so use `install i915 /bin/true` for now.
+
+install i915 /bin/true
diff --git a/misc_etc_files/sysctl.conf b/misc_etc_files/sysctl.conf
@@ -45,3 +45,9 @@ kernel.shmall = 34359738368
 # user request: Allow CPU event access by users without CAP_SYS_ADMIN
 
 kernel.perf_event_paranoid = -1
+
+# allow inet free binds (bind to any ip address) so that services which bind to
+# specific ip addresses (e.g. $MX_IPADDR) don't need to wait for network setup
+
+net.ipv4.ip_nonlocal_bind = 1
+net.ipv6.ip_nonlocal_bind = 1
diff --git a/misc_systemd_units/admin-sshd.service b/misc_systemd_units/admin-sshd.service
@@ -1,7 +1,4 @@
 [Unit]
-Description=Admin sshd
-After=network.target
-
 ConditionHost=|bka.molgen.mpg.de
 
 [Service]

diff --git a/misc_systemd_units/automount.service b/misc_systemd_units/automount.service
@@ -1,16 +1,17 @@
 [Unit]
-Description=Automounter
-Requires=basic.target
-After=basic.target
+DefaultDependencies=no
+Requires=sysinit.target
+After=sysinit.target
+Before=basic.target
+After=network.target
 
 [Service]
 Type=forking
-ExecStartPre=/usr/sbin/make-automaps
 ExecStart=/usr/sbin/automount -v
 PIDFile=/run/autofs-running
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=basic.target
 
diff --git 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/enable_overcommit_memory.service b/misc_systemd_units/enable_overcommit_memory.service
@@ -1,6 +1,4 @@
 [Unit]
-Wants=startup-tags.service
-After=startup-tags.service
 ConditionPathExists=|/node/tags/desktop
 ConditionHost=|beebee-ate.molgen.mpg.de
 ConditionHost=|icebear.molgen.mpg.de

diff --git 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/fix-lpp.service b/misc_systemd_units/fix-lpp.service
diff --git a/misc_systemd_units/fix-uring.service b/misc_systemd_units/fix-uring.service
diff --git 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/i915.service b/misc_systemd_units/i915.service
@@ -0,0 +1,10 @@
+[Unit]
+After=getty-pre.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=modprobe -C /dev/null i915
+
+[Install]
+WantedBy=multi-user.target
diff --git a/misc_systemd_units/ip6.service b/misc_systemd_units/ip6.service
@@ -0,0 +1,15 @@
+[Unit]
+DefaultDependencies=no
+Wants=startup-tags.service
+After=startup-tags.service
+ConditionPathExists=/node/tags/ip6
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/bash -c "echo 0 >/proc/sys/net/ipv6/conf/all/disable_ipv6"
+ExecStop=/usr/bin/bash -c "echo 1 >/proc/sys/net/ipv6/conf/all/disable_ipv6"
+
+[Install]
+WantedBy=network.target
+
diff --git a/misc_systemd_units/lightdm.service b/misc_systemd_units/lightdm.service
@@ -0,0 +1,11 @@
+[Unit]
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/lightdm
+Restart=always
+BusName=org.freedesktop.DisplayManager
+UMask=007
+
+[Install]
+Alias=display-manager.service
diff --git a/misc_systemd_units/mxvlan.service b/misc_systemd_units/mxvlan.service
@@ -1,7 +1,6 @@
 [Unit]
-Description=MX VLAN Setup
-Wants=network.service
-After=network.service
+DefaultDependencies=no
+After=sysinit.target
 Before=network.target
 
 [Service]
@@ -12,5 +11,5 @@ ExecStop=/usr/sbin/mxvlanctl stop
 ExecReload=/usr/sbin/mxvlanctl restart
 
 [Install]
-WantedBy=network.target
+WantedBy=multi-user.target
 
diff --git a/misc_systemd_units/named.service b/misc_systemd_units/named.service
@@ -1,7 +1,4 @@
 [Unit]
-After=network.service gateway.service mxmount.service automount.service
-
-Before=mxstartup-mxvip.service
 ConditionHost=wtf.molgen.mpg.de
 
 [Service]
@@ -11,5 +8,5 @@ ExecStart=/package/dns/2014-12-03/sbin/named -4 -c /package/dns/2014-12-03/etc/n
 ExecStopPost=-/sbin/ip addr del 141.14.16.1/20 dev net03
 
 [Install]
-WantedBy=network.target
+WantedBy=multi-user.target
 
diff --git a/misc_systemd_units/network.service b/misc_systemd_units/network.service
@@ -1,6 +1,8 @@
 [Unit]
-Description=Network Connectivity
 DefaultDependencies=no
+After=sysinit.target
+Before=network.target
+Wants=network.target
 
 [Service]
 EnvironmentFile=/etc/local/mxhost.conf
@@ -13,4 +15,4 @@ ExecStart=/sbin/ip route add default via 141.14.16.128
 ExecStop=/sbin/ip addr del ${MX_IPADDR}/20 dev ${MX_NETDEV}
 
 [Install]
-WantedBy=network.target
+WantedBy=multi-user.target
diff --git a/misc_systemd_units/nfsd.service b/misc_systemd_units/nfsd.service
@@ -1,9 +1,10 @@
 [Unit]
-Description=NFS Daemon
+DefaultDependencies=no
 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
-Wants=unbound.service
+Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount
+After=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount
+After=sysinit.target
+Conflicts=shutdown.target
 
 [Service]
 ExecStartPre=/bin/mkdir -p /var/lib/nfs/v4recovery

diff --git 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
@@ -1,7 +1,3 @@
-[Unit]
-Description=OpenSSH Secure Shell Service
-After=syslog.target network.target
-
 [Service]
 EnvironmentFile=/etc/local/mxhost.conf
 ExecStart=/usr/sbin/sshd -D -o "ListenAddress ${MX_IPADDR}"

diff --git a/misc_systemd_units/startup-tags.service b/misc_systemd_units/startup-tags.service
@@ -1,7 +1,12 @@
 [Unit]
+DefaultDependencies=no
+After=systemd-remount-fs.service
+Before=sysinit.target
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/sbin/hostconfig --populate-node
 
+[Install]
+WantedBy=sysinit.target
diff --git a/misc_systemd_units/udev-settled.target b/misc_systemd_units/udev-settled.target
diff --git a/misc_systemd_units/unbound.service b/misc_systemd_units/unbound.service
@@ -1,5 +1,7 @@
 [Unit]
-After=network.service gateway.service
+DefaultDependencies=no
+After=sysinit.target
+Before=network.target
 
 [Service]
 Type=forking
@@ -8,5 +10,5 @@ ExecStart=/usr/sbin/unbound
 PIDFile=/var/unbound/unbound.pid
 
 [Install]
-WantedBy=network.target
+WantedBy=multi-user.target
 
diff --git a/misc_systemd_units/wait-network-online.service b/misc_systemd_units/wait-network-online.service
@@ -0,0 +1,14 @@
+[Unit]
+DefaultDependencies=no
+After=sysinit.target network.target
+Before=network-online.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+TimeoutStartSec=15
+StandardOutput=null
+ExecStart=bash -c 'while ! ping -c 1 -w 1 rick.molgen.mpg.de; do sleep 1 ; done'
+
+[Install]
+WantedBy=network-online.target
diff --git a/misc_systemd_units/xaruba.service b/misc_systemd_units/xaruba.service