Use systemd unit key ConditionHost=

`ConditionHost=` was added in systemd 189, so let’s use it, now that we are not running systemd 27 anymore. $ more /usr/sbin/startup-hostname […] # This is a workaround for our systemd version not having ConditionHost= # This little helper is called by startup-hostname.service and creates # /node/startup-hostname/HOSTNAME # So other services can use # Wants=startup-hostname.service # After=startup-hostname.service # ConditionPathExists=/node/startup-hostname/HOSTNAME # to start a unit only on a specific host # […]
mariux64 · Feb 25, 2020 · e497beb · e497beb
1 parent e731f1b
commit e497beb
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 23 deletions.
diff --git a/install.sh b/install.sh
@@ -91,7 +91,6 @@ install_data misc_systemd_units/dhcrelay.service         "$DESTDIR$systemdunitdi
 install_data misc_systemd_units/enable_overcommit_memory.service "$DESTDIR$systemdunitdir/enable_overcommit_memory.service"
 install_data misc_systemd_units/gdm.service              "$DESTDIR$systemdunitdir/gdm.service"
 install_data misc_systemd_units/startup-tags.service     "$DESTDIR$systemdunitdir/startup-tags.service"
-install_data misc_systemd_units/startup-hostname.service "$DESTDIR$systemdunitdir/startup-hostname.service"
 install_data misc_systemd_units/unbound.service          "$DESTDIR$systemdunitdir/unbound.service"
 install_data misc_systemd_units/xaruba.service           "$DESTDIR$systemdunitdir/xaruba.service"
 install_data misc_systemd_units/yppasswd.service         "$DESTDIR$systemdunitdir/yppasswd.service"

diff --git a/misc_systemd_units/dhcrelay.service b/misc_systemd_units/dhcrelay.service
@@ -4,9 +4,7 @@ Description=DHCP relay
 Requires=network.target
 After=network.target
 
-Wants=startup-hostname.service
-After=startup-hostname.service
-ConditionPathExists=/node/startup-hostname/bka
+ConditionHost=bka.molgen.mpg.de
 
 [Service]
 

diff --git a/misc_systemd_units/named.service b/misc_systemd_units/named.service
@@ -1,10 +1,8 @@
 [Unit]
 After=network.service gateway.service mxmount.service automount.service
 
-Wants=startup-hostname.service
-After=startup-hostname.service
 Before=mxstartup-mxvip.service
-ConditionPathExists=/node/startup-hostname/wtf
+ConditionHost=wtf.molgen.mpg.de
 
 [Service]
 Type=forking

diff --git a/misc_systemd_units/startup-hostname.service b/misc_systemd_units/startup-hostname.service
diff --git a/misc_systemd_units/xaruba.service b/misc_systemd_units/xaruba.service
@@ -2,9 +2,7 @@
 After=network.service gateway.service mxmount.service
 Before=network.target
 
-Wants=startup-hostname.service
-After=startup-hostname.service
-ConditionPathExists=/node/startup-hostname/macheteinfach
+ConditionHost=macheteinfach.molgen.mpg.de
 
 [Service]
 Type=oneshot

diff --git a/misc_systemd_units/yppasswd.service b/misc_systemd_units/yppasswd.service
@@ -1,9 +1,7 @@
 [Unit]
 After=network.service gateway.service mxmount.service automount.service
 
-Wants=startup-hostname.service
-After=startup-hostname.service
-ConditionPathExists=/node/startup-hostname/wtf
+ConditionHost=wtf.molgen.mpg.de
 
 [Service]
 Type=forking

diff --git a/misc_systemd_units/ypserv.service b/misc_systemd_units/ypserv.service
@@ -2,9 +2,7 @@
 After=network.service gateway.service mxmount.service automount.service
 Before=network.target
 
-Wants=startup-hostname.service
-After=startup-hostname.service
-ConditionPathExists=/node/startup-hostname/wtf
+ConditionHost=wtf.molgen.mpg.de
 
 [Service]
 Type=forking