From d76ee8eee33f65f413b70beba15ab5a68c558b6b Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 1 Mar 2025 17:16:14 +0100
Subject: [PATCH] Run pcid-spawner right after starting pcid

---
 recipes/core/drivers-initfs/recipe.toml           | 3 ++-
 recipes/core/drivers/recipe.toml                  | 3 ++-
 recipes/core/initfs/aarch64-unknown-redox/init.rc | 3 ++-
 recipes/core/initfs/init.rc                       | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/recipes/core/drivers-initfs/recipe.toml b/recipes/core/drivers-initfs/recipe.toml
index f4d3fd1f..eecbb7c7 100644
--- a/recipes/core/drivers-initfs/recipe.toml
+++ b/recipes/core/drivers-initfs/recipe.toml
@@ -12,6 +12,7 @@ BINS=(
     lived
     nvmed
     pcid
+    pcid-spawner
     vesad
 )
 
@@ -62,7 +63,7 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
 for bin in "${BINS[@]}"
 do
     case "${bin}" in
-      pcid | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid)
+      pcid | pcid-spawner | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid)
         cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
         ;;
       *)
diff --git a/recipes/core/drivers/recipe.toml b/recipes/core/drivers/recipe.toml
index b29a42a2..417fc19d 100644
--- a/recipes/core/drivers/recipe.toml
+++ b/recipes/core/drivers/recipe.toml
@@ -11,6 +11,7 @@ BINS=(
     ihdad
     ixgbed
     pcid
+    pcid-spawner
     rtl8139d
     rtl8168d
     usbctl
@@ -41,7 +42,7 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
     $(for bin in "${BINS[@]}"; do echo "-p" "${bin}"; done)
 for bin in "${BINS[@]}"
 do
-    if [[ "${bin}" == "inputd" || "${bin}" == "pcid" ]]; then
+    if [[ "${bin}" == "inputd" || "${bin}" == "pcid" || "${bin}" == "pcid-spawner" ]]; then
         cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/usr/bin"
     else
         cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/usr/lib/drivers"
diff --git a/recipes/core/initfs/aarch64-unknown-redox/init.rc b/recipes/core/initfs/aarch64-unknown-redox/init.rc
index 0c64d22c..175af583 100644
--- a/recipes/core/initfs/aarch64-unknown-redox/init.rc
+++ b/recipes/core/initfs/aarch64-unknown-redox/init.rc
@@ -13,7 +13,8 @@ logd /scheme/debug /scheme/fbbootlog
 stdio /scheme/log
 ramfs logging
 acpid
-pcid /etc/pcid/initfs.toml
+pcid
+pcid-spawner /etc/pcid/initfs.toml
 lived
 unset DISK_LIVE_ADDR DISK_LIVE_SIZE
 redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
diff --git a/recipes/core/initfs/init.rc b/recipes/core/initfs/init.rc
index 48a5855b..c5318130 100644
--- a/recipes/core/initfs/init.rc
+++ b/recipes/core/initfs/init.rc
@@ -14,7 +14,8 @@ stdio /scheme/log
 ramfs logging
 ps2d us
 acpid
-pcid /etc/pcid/initfs.toml
+pcid
+pcid-spawner /etc/pcid/initfs.toml
 lived
 unset DISK_LIVE_ADDR DISK_LIVE_SIZE
 redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK