From 3deb021bce55ca9685ee0c4f41c72ea4fc98f39b Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Thu, 12 Feb 2026 14:28:39 +0100
Subject: [PATCH] board/common: postpone start of dbus to after confd bootstrap

Infix technically does not need to start dbus and dnsmasq before confd
has loaded the system startup-config.  So we move it in time to save
some CPU cycles for confd & C:o.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 board/common/rootfs/etc/finit.d/dbus.conf                    | 2 +-
 package/confd/resolvconf.conf                                | 5 ++---
 .../skeleton/etc/finit.d/available/dnsmasq.conf              | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/board/common/rootfs/etc/finit.d/dbus.conf b/board/common/rootfs/etc/finit.d/dbus.conf
index 790c757a..43b4eb67 100644
--- a/board/common/rootfs/etc/finit.d/dbus.conf
+++ b/board/common/rootfs/etc/finit.d/dbus.conf
@@ -1,5 +1,5 @@
 # Override Finit plugin
 service cgroup.system name:dbus notify:none pid:!/run/messagebus.pid \
-	[S123456789] <pid/syslogd> /usr/bin/dbus-daemon --nofork --system --syslog-only \
+	[S123456789] <usr/bootstrap> /usr/bin/dbus-daemon --nofork --system --syslog-only \
 	-- D-Bus message bus daemon
 
diff --git a/package/confd/resolvconf.conf b/package/confd/resolvconf.conf
index e08a1acc..1edc74b7 100644
--- a/package/confd/resolvconf.conf
+++ b/package/confd/resolvconf.conf
@@ -1,3 +1,2 @@
-# Create initial /etc/resolv.conf after successful bootstrap, regardless
-# of startup-config or failure-config.  Condition set by confd.
-task [S12345] <usr/bootstrap> resolvconf -u -- Update DNS configuration
+# Update /etc/resolv.conf after successful bootstrap and reconf.
+task [S12345] <usr/bootstrap,pid/dnsmasq> resolvconf -u --
diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/dnsmasq.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/dnsmasq.conf
index a14723e8..c95bf581 100644
--- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/dnsmasq.conf
+++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/dnsmasq.conf
@@ -1 +1 @@
-service [S12345] <!pid/syslogd> dnsmasq -k -u root -- DHCP/DNS proxy
+service [S12345] <!service/dbus/ready> dnsmasq -k -u root -- DHCP/DNS proxy