d743bb5bcc
This reverts commits3fb4a15096and0e8350ca14. Either building with meson or other upstream changes was causing issues with booting, and I didn't have time to debug this properly.
50 lines
2.3 KiB
Diff
50 lines
2.3 KiB
Diff
From edfdd314c82f42d2e571a24d6a8bdc674a892b43 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Mon, 27 Mar 2017 06:55:55 -0400
|
|
Subject: [PATCH] units: make enablement of s-n-wait-online.service follow
|
|
systemd-networkd.service (#5635)
|
|
|
|
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(cherry picked from commit 9e49656037717b96c06b1f1507a41550bdb2c795)
|
|
---
|
|
system-preset/90-systemd.preset | 1 -
|
|
units/systemd-networkd.service.m4.in | 6 ++++++
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/system-preset/90-systemd.preset b/system-preset/90-systemd.preset
|
|
index 6b5349dc8d..3ba4bb760d 100644
|
|
--- 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 d1cf3fc133..2623b21947 100644
|
|
--- a/units/systemd-networkd.service.m4.in
|
|
+++ b/units/systemd-networkd.service.m4.in
|
|
@@ -39,3 +39,9 @@ SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module @mount @obsolete
|
|
[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
|