new file mode 100644
@@ -0,0 +1,43 @@
+From 479a2dcb1295cb1f27ee883286c9ef917c4d71f5 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Fri, 29 May 2026 01:12:29 +0900
+Subject: [PATCH] units: drop Before=sockets.target from networkd resolve hook
+
+Otherwise, it introduces cyclic dependencies:
+```
+systemd[1]: sockets.target: Found ordering cycle:
+ systemd-networkd-resolve-hook.socket/start after network-pre.target/start after
+ iptables.service/start after basic.target/start after sockets.target/start -
+ after systemd-networkd-resolve-hook.socket
+systemd[1]: sockets.target: Job systemd-networkd-resolve-hook.socket/start deleted
+ to break ordering cycle starting with sockets.target/start
+```
+
+Follow-up for 37adb410a2b62716b666dbf8359edf8a6546ff94.
+Fixes #42353.
+
+(cherry picked from commit 20572a8938dd017a23478a66c04f5768b763cb56)
+(cherry picked from commit 26c0d2d61c2e27cca1a1a490ea07770ffef80785)
+
+Upstream-Status: Backport [https://github.com/systemd/systemd/commit/20572a8938dd017a23478a66c04f5768b763cb56]
+Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
+---
+ units/systemd-networkd-resolve-hook.socket | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/units/systemd-networkd-resolve-hook.socket b/units/systemd-networkd-resolve-hook.socket
+index 8a724bbc0c..07b596319b 100644
+--- a/units/systemd-networkd-resolve-hook.socket
++++ b/units/systemd-networkd-resolve-hook.socket
+@@ -13,7 +13,7 @@ Documentation=man:systemd-networkd.service(8)
+ ConditionCapability=CAP_NET_ADMIN
+ DefaultDependencies=no
+ After=network-pre.target
+-Before=sockets.target shutdown.target
++Before=shutdown.target
+ Conflicts=shutdown.target
+
+ [Socket]
+--
+2.47.3
+
new file mode 100644
@@ -0,0 +1,36 @@
+From 55ee2c19a22afbc93227906d9ed905c625ede179 Mon Sep 17 00:00:00 2001
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Fri, 24 Apr 2026 09:38:42 -0400
+Subject: [PATCH] units: order networkd resolve hook After=network-pre.target
+
+Without this, the socket is available well before systemd-networkd.service
+is able to start, because of its own After=network-pre.target ordering.
+Then, if resolved handles queries before network-pre.target, it will
+hang waiting for networkd to reply to hook queries.
+
+This is currently happening in the wild with cloud-init.
+
+(cherry picked from commit 37adb410a2b62716b666dbf8359edf8a6546ff94)
+(cherry picked from commit 6f5079de5d5eab115635a959a68af8438f3d88fd)
+
+Upstream-Status: Backport [https://github.com/systemd/systemd/commit/37adb410a2b62716b666dbf8359edf8a6546ff94]
+Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
+---
+ units/systemd-networkd-resolve-hook.socket | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/units/systemd-networkd-resolve-hook.socket b/units/systemd-networkd-resolve-hook.socket
+index 3c11b8e8de..8a724bbc0c 100644
+--- a/units/systemd-networkd-resolve-hook.socket
++++ b/units/systemd-networkd-resolve-hook.socket
+@@ -12,6 +12,7 @@ Description=Network Management Resolve Hook Socket
+ Documentation=man:systemd-networkd.service(8)
+ ConditionCapability=CAP_NET_ADMIN
+ DefaultDependencies=no
++After=network-pre.target
+ Before=sockets.target shutdown.target
+ Conflicts=shutdown.target
+
+--
+2.47.3
+
@@ -36,6 +36,8 @@ SRC_URI += " \
file://0018-shared-fdset-add-detailed-debug-logging-to-fdset_new.patch \
file://0004-tpm2-util-fix-PCR-bank-guessing-without-EFI.patch \
file://0001-Revert-resolve-refuse-traffic-from-the-local-host-only.patch \
+ file://0001-units-order-networkd-resolve-hook-After-network-pre.patch \
+ file://0001-units-drop-Before-sockets.target-from-networkd-resol.patch \
"
PAM_PLUGINS = " \
systemd-networkd-resolve-hook.socket is ordered before sockets.target, so it listens long before systemd-networkd.service can start after network-pre.target. Until networkd answers, systemd-resolved sends every lookup not found in /etc/hosts to the hook, and each one waits 30 s for the hook query to time out: systemd-resolved[134]: Query on hook '/run/systemd/resolve.hook/io.systemd.Network' failed with error 'io.systemd.TimedOut', ignoring. Backport systemd commits 37adb410a2b6 and 20572a8938dd, which order the socket after network-pre.target and drop Before=sockets.target to avoid an ordering cycle. They are in systemd 259.7 and 261; OE-Core master already has them. Lookups made later, while other ordering still holds networkd back, keep waiting on the hook. Tested on qemux86-64 with systemd-resolved: a lookup ordered before network-pre.target now returns at once instead of after 30 s, and networkd and the hook socket start with no ordering cycles. AI-Generated: Uses Claude Code (Claude Opus 5.5) Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> --- ...e-sockets.target-from-networkd-resol.patch | 43 +++++++++++++++++++ ...workd-resolve-hook-After-network-pre.patch | 36 ++++++++++++++++ meta/recipes-core/systemd/systemd_259.5.bb | 2 + 3 files changed, 81 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-units-drop-Before-sockets.target-from-networkd-resol.patch create mode 100644 meta/recipes-core/systemd/systemd/0001-units-order-networkd-resolve-hook-After-network-pre.patch