units: make enablement of s-n-wait-online.service follow systemd-networkd.service...

In 58a6dd15582c038a25bd7059435833943e2e4617 s-n-wait-online.service was added
to presets to synchronize the presets with the state after installation. But it
is harmful to have s-n-wait-online.service enabled when s-n.service is
disabled, because s-n-wait-online.service has Requsite=s-n.service and cannot
be activated. Thus remove s-n-wait-online.service from presets again, and let
it be enabled whenever s-n.service is enabled.

During installation we create enablement symlinks by hand, and since s-n.service
is enabled, s-n-w-o.service should be enabled too, so the symlink should still
be created during installation.

https://bugzilla.redhat.com/show_bug.cgi?id=1433459#c15

diff --git a/system-preset/90-systemd.preset b/system-preset/90-systemd.preset
index 6b5349dc8df8e463266aa446695fe83bb18c09c3..3ba4bb760df9a73b143e30407e1429666110a2bb 100644 (file)
--- a/system-preset/90-systemd.preset
+++ b/system-preset/90-systemd.preset
@@ -15,7 +15,6 @@ enable getty@.service
 enable systemd-timesyncd.service
 enable systemd-networkd.service
 enable systemd-resolved.service
-enable systemd-networkd-wait-online.service
 
 disable console-getty.service
 disable debug-shell.service

diff --git a/units/systemd-networkd.service.m4.in b/units/systemd-networkd.service.m4.in
index c3f153046a88c0575f5f68df4cdd58ddb1298d0a..5811b00819058c0233e719bc888cbe8f03988dc9 100644 (file)
--- a/units/systemd-networkd.service.m4.in
+++ b/units/systemd-networkd.service.m4.in
@@ -42,3 +42,9 @@ ReadWritePaths=/run/systemd
 [Install]
 WantedBy=multi-user.target
 Also=systemd-networkd.socket
+
+# We want to enable systemd-networkd-wait-online.service whenever this service
+# is enabled. systemd-networkd-wait-online.service has
+# WantedBy=network-online.target, so enabling it only has an effect if
+# network-online.target itself is enabled or pulled in by some other unit.
+Also=systemd-networkd-wait-online.service