From 957cfbd005c303e4e74408c71e80750ae5f350a7 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 18 Jan 2024 13:41:32 -0700
Subject: [PATCH] initfs: use new scheme format

---
 recipes/core/initfs/aarch64-unknown-redox/init.rc    | 12 ++++++------
 .../initfs/aarch64-unknown-redox/init.rc.raspi3bp    | 12 ++++++------
 recipes/core/initfs/init.rc                          | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/recipes/core/initfs/aarch64-unknown-redox/init.rc b/recipes/core/initfs/aarch64-unknown-redox/init.rc
index 2d3160639..feb70b6ab 100644
--- a/recipes/core/initfs/aarch64-unknown-redox/init.rc
+++ b/recipes/core/initfs/aarch64-unknown-redox/init.rc
@@ -1,4 +1,4 @@
-export PATH /bin
+export PATH /scheme/initfs/bin
 export TMPDIR /tmp
 nulld
 zerod
@@ -6,11 +6,11 @@ randd
 inputd
 vesad G G G
 fbcond 1 2
-logd debug: fbcon:1
-stdio log:
+logd /scheme/debug /scheme/fbcon/1
+stdio /scheme/log
 ramfs logging
 lived
 redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
-cd file:
-export PATH file:/bin
-run.d /etc/init.d
+cd /
+export PATH /bin
+run.d /usr/lib/init.d /etc/init.d
diff --git a/recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp b/recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp
index 7f1945933..b21c365dd 100644
--- a/recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp
+++ b/recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp
@@ -1,4 +1,4 @@
-export PATH /bin
+export PATH /scheme/initfs/bin
 export TMPDIR /tmp
 nulld
 zerod
@@ -6,12 +6,12 @@ randd
 inputd
 vesad G G G
 fbcond 1 2
-logd debug: fbcon:1
-stdio log:
+logd /scheme/debug /scheme/fbcon/1
+stdio /scheme/log
 ramfs logging
 lived
 bcm2835-sdhcid
 redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
-cd file:
-export PATH file:/bin
-run.d /etc/init.d
+cd /
+export PATH /bin
+run.d /usr/lib/init.d /etc/init.d
diff --git a/recipes/core/initfs/init.rc b/recipes/core/initfs/init.rc
index f2f3726e3..6b459dcde 100644
--- a/recipes/core/initfs/init.rc
+++ b/recipes/core/initfs/init.rc
@@ -1,4 +1,4 @@
-export PATH /bin
+export PATH /scheme/initfs/bin
 export TMPDIR /tmp
 nulld
 zerod
@@ -6,14 +6,14 @@ randd
 inputd
 vesad G G G
 fbcond 1 2
-logd debug: fbcon:1
-stdio log:
+logd /scheme/debug /scheme/fbcon/1
+stdio /scheme/log
 ps2d us
 ramfs logging
 acpid
-pcid /etc/pcid/initfs.toml
+pcid /scheme/initfs/etc/pcid/initfs.toml
 lived
 redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
-cd file:
-export PATH file:/bin
+cd /
+export PATH /bin
 run.d /usr/lib/init.d /etc/init.d
-- 
GitLab