[patch] a patch resolving the problem

0001-units-Shut-down-networkd-and-resolved-on-switch-root.patch (text/plain), 2.05 KB, created by alexander haensch on 2023-07-15 19:33:31 UTC

From 75efd16fb001ba19d12362198ba5c44cb6f40d04 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <[e-mail]>
Date: Thu, 25 May 2023 18:13:02 +0200
Subject: [PATCH] units: Shut down networkd and resolved on switch-root

Let's explicitly order these against initrd-switch-root.target, so
that they are properly shut down before we switch root. Otherwise,
there's a race condition where networkd might only shut down after
switching root and after we've already we've loaded the unit graph,
meaning it won't be restarted in the rootfs.

Fixes #27718
---
 units/systemd-networkd.service.in | 4 ++--
 units/systemd-resolved.service.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
index 585bbe5e6d..9f0af57fdc 100644
--- a/units/systemd-networkd.service.in
+++ b/units/systemd-networkd.service.in
@@ -15,8 +15,8 @@ ConditionCapability=CAP_NET_ADMIN
 DefaultDependencies=no
 # systemd-udevd.service can be dropped once tuntap is moved to netlink
 After=systemd-networkd.socket systemd-udevd.service network-pre.target systemd-sysusers.service systemd-sysctl.service
-Before=network.target multi-user.target shutdown.target
-Conflicts=shutdown.target
+Before=network.target multi-user.target shutdown.target initrd-switch-root.target
+Conflicts=shutdown.target initrd-switch-root.target
 Wants=systemd-networkd.socket network.target
 
 [Service]
diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.in
index b4227ffd42..10ce49345e 100644
--- a/units/systemd-resolved.service.in
+++ b/units/systemd-resolved.service.in
@@ -16,8 +16,8 @@ Documentation=https://www.freedesktop.org/wiki/Software/systemd/writing-resolver
 
 DefaultDependencies=no
 After=systemd-sysusers.service
-Before=sysinit.target network.target nss-lookup.target shutdown.target
-Conflicts=shutdown.target
+Before=sysinit.target network.target nss-lookup.target shutdown.target initrd-switch-root.target
+Conflicts=shutdown.target initrd-switch-root.target
 Wants=nss-lookup.target
 
 [Service]
-- 
2.41.0