From 473bee2d66479b1b77a1b872f53f76d538d00b4f Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Fri, 10 Apr 2026 22:47:52 +0200
Subject: [PATCH] Move some init configs into the base recipe

---
 config/acid.toml                   |  2 +-
 config/auto-test.toml              |  2 +-
 config/base.toml                   | 28 ----------------------------
 config/desktop-minimal.toml        |  2 +-
 config/minimal.toml                |  2 +-
 config/os-test.toml                |  2 +-
 config/redoxer-gui.toml            |  2 +-
 config/redoxer.toml                | 16 +++++++++++-----
 config/wayland.toml                |  2 +-
 config/x11.toml                    |  4 ++--
 config/x86_64/desktop-contain.toml |  2 +-
 config/x86_64/server-demo.toml     |  2 +-
 recipes/core/base/recipe.toml      |  7 +++++--
 13 files changed, 27 insertions(+), 46 deletions(-)

diff --git a/config/acid.toml b/config/acid.toml
index 5392934f..139e0326 100644
--- a/config/acid.toml
+++ b/config/acid.toml
@@ -16,7 +16,7 @@ ion = {}
 [[files]]
 path = "/usr/lib/init.d/10_acid"
 data = """
-requires_weak 00_drivers
+requires_weak 00_base.target
 ion /usr/lib/run_acid.ion
 """
 
diff --git a/config/auto-test.toml b/config/auto-test.toml
index b6ff9786..e6f3032a 100644
--- a/config/auto-test.toml
+++ b/config/auto-test.toml
@@ -15,7 +15,7 @@ auto-test = {}
 [[files]]
 path = "/usr/lib/init.d/30_console"
 data = """
-requires_weak 10_net
+requires_weak 10_net.target
 ion /usr/lib/run_tests.ion
 """
 
diff --git a/config/base.toml b/config/base.toml
index cdb134c1..4f6c8f57 100644
--- a/config/base.toml
+++ b/config/base.toml
@@ -22,34 +22,6 @@ userutils = {}
 uutils = {}
 
 ## Configuration files
-[[files]]
-path = "/usr/lib/init.d/00_base"
-data = """
-# clear and recreate tmpdir with 0o1777 permission
-rm -rf /tmp
-mkdir -m a=rwxt /tmp
-
-notify ipcd
-notify ptyd
-nowait sudo --daemon
-"""
-
-[[files]]
-path = "/usr/lib/init.d/00_drivers"
-data = """
-requires_weak 00_base
-pcid-spawner
-"""
-
-## Network init
-[[files]]
-path = "/usr/lib/init.d/10_net"
-data = """
-requires_weak 00_drivers
-notify smolnetd
-nowait dhcpd
-"""
-
 [[files]]
 path = "/etc/login_schemes.toml"
 data = """
diff --git a/config/desktop-minimal.toml b/config/desktop-minimal.toml
index 852dc837..a1cf799c 100644
--- a/config/desktop-minimal.toml
+++ b/config/desktop-minimal.toml
@@ -17,7 +17,7 @@ orbutils = {}
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
 data = """
-requires_weak 10_net
+requires_weak 10_net.target
 notify audiod
 nowait VT=3 orbital orblogin launcher
 """
diff --git a/config/minimal.toml b/config/minimal.toml
index 5f110740..7ccb60db 100644
--- a/config/minimal.toml
+++ b/config/minimal.toml
@@ -19,7 +19,7 @@ kibi = {}
 [[files]]
 path = "/usr/lib/init.d/30_console"
 data = """
-requires_weak 10_net
+requires_weak 10_net.target
 inputd -A 2
 nowait getty 2
 nowait getty /scheme/debug/no-preserve -J
diff --git a/config/os-test.toml b/config/os-test.toml
index 58ed1b4b..048e31f8 100644
--- a/config/os-test.toml
+++ b/config/os-test.toml
@@ -16,7 +16,7 @@ os-test-bins = {} # Provides source and cross-compiled binaries
 [[files]]
 path = "/usr/lib/init.d/30_console"
 data = """
-requires_weak 10_net
+requires_weak 10_net.target
 RUST_BACKTRACE=full os-test-runner
 shutdown
 """
diff --git a/config/redoxer-gui.toml b/config/redoxer-gui.toml
index c3e6149a..bc50407b 100644
--- a/config/redoxer-gui.toml
+++ b/config/redoxer-gui.toml
@@ -11,7 +11,7 @@ orbital = {}
 [[files]]
 path = "/usr/lib/init.d/30_redoxer"
 data = """
-requires_weak 10_net
+requires_weak 10_net.target
 echo
 echo "## running redoxer in orbital ##"
 nowait VT=3 orbital redoxerd
diff --git a/config/redoxer.toml b/config/redoxer.toml
index 6532300d..ce044439 100644
--- a/config/redoxer.toml
+++ b/config/redoxer.toml
@@ -17,17 +17,23 @@ sed = {}
 
 # Override to not background dhcpd
 [[files]]
-path = "/usr/lib/init.d/10_net"
+path = "/usr/lib/init.d/10_dhcpd.service"
 data = """
-requires_weak 00_drivers
-notify smolnetd
-dhcpd
+[unit]
+description = "Network configuration using DHCP"
+requires_weak = [
+    "10_smolnetd.service",
+]
+
+[service]
+cmd = "dhcpd"
+type = "oneshot"
 """
 
 [[files]]
 path = "/usr/lib/init.d/30_redoxer"
 data = """
-requires_weak 10_net
+requires_weak 10_net.target
 ion /usr/lib/run_redoxer.ion
 """
 
diff --git a/config/wayland.toml b/config/wayland.toml
index f750313c..60ed9b93 100644
--- a/config/wayland.toml
+++ b/config/wayland.toml
@@ -32,7 +32,7 @@ xkeyboard-config = {}
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
 data = """
-requires_weak 10_net
+requires_weak 10_net.target
 notify audiod
 nowait BROWSER=/bin/netsurf-fb VT=3 orbital orbital-wayland
 """
diff --git a/config/x11.toml b/config/x11.toml
index b74918c1..7100191d 100644
--- a/config/x11.toml
+++ b/config/x11.toml
@@ -25,7 +25,7 @@ zenity = {}
 [[files]]
 path = "/usr/lib/init.d/10_dbus"
 data = """
-requires_weak 10_net
+requires_weak 10_net.target
 bash /usr/bin/start-dbus.sh
 """
 
@@ -47,7 +47,7 @@ dbus-daemon --system
 [[files]]
 path = "/usr/lib/init.d/10_xenv"
 data = """
-requires_weak 10_net
+requires_weak 10_net.target
 glib-compile-schemas /usr/share/glib-2.0/schemas/
 """
 
diff --git a/config/x86_64/desktop-contain.toml b/config/x86_64/desktop-contain.toml
index 6fca0f18..4469792d 100644
--- a/config/x86_64/desktop-contain.toml
+++ b/config/x86_64/desktop-contain.toml
@@ -17,7 +17,7 @@ include = ["../desktop.toml"]
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
 data = """
-requires_weak 10_net
+requires_weak 10_net.target
 notify audiod
 nowait VT=3 orbital contain_orblogin launcher
 """
diff --git a/config/x86_64/server-demo.toml b/config/x86_64/server-demo.toml
index 32c5770a..ac775efc 100644
--- a/config/x86_64/server-demo.toml
+++ b/config/x86_64/server-demo.toml
@@ -38,7 +38,7 @@ website = {}
 [[files]]
 path = "/usr/lib/init.d/98_keygen_sh"
 data = """
-requires_weak 10_net
+requires_weak 10_net.target
 bash /root/keygen.sh
 """
 
diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml
index da6805d9..700ca5b3 100644
--- a/recipes/core/base/recipe.toml
+++ b/recipes/core/base/recipe.toml
@@ -67,10 +67,13 @@ do
     fi
 done
 
-mkdir -pv "${COOKBOOK_STAGE}/lib/pcid.d"
+mkdir -pv "${COOKBOOK_STAGE}/usr/lib/init.d/"
+cp "${COOKBOOK_SOURCE}/init.d"/* "${COOKBOOK_STAGE}/usr/lib/init.d/"
+
+mkdir -pv "${COOKBOOK_STAGE}/usr/lib/pcid.d"
 ${FIND} "${COOKBOOK_SOURCE}/drivers" -maxdepth 3 -type f -name 'config.toml' | while read conf
 do
     driver="$(basename "$(dirname "$conf")")"
-    cp -v "$conf" "${COOKBOOK_STAGE}/lib/pcid.d/$driver.toml"
+    cp -v "$conf" "${COOKBOOK_STAGE}/usr/lib/pcid.d/$driver.toml"
 done
 """