From ffb7c2ca278328d06295121785651159552de1ed Mon Sep 17 00:00:00 2001 From: Jeremy Soller <jackpot51@gmail.com> Date: Thu, 18 Jan 2024 15:17:21 -0700 Subject: [PATCH] initfs: unset variables only meant for initfs drivers --- recipes/core/initfs/aarch64-unknown-redox/init.rc | 4 ++++ recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp | 4 ++++ recipes/core/initfs/init.rc | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/recipes/core/initfs/aarch64-unknown-redox/init.rc b/recipes/core/initfs/aarch64-unknown-redox/init.rc index da835dfee..f794e3ca6 100644 --- a/recipes/core/initfs/aarch64-unknown-redox/init.rc +++ b/recipes/core/initfs/aarch64-unknown-redox/init.rc @@ -5,12 +5,16 @@ zerod randd inputd vesad G G G +unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE +#TODO: unset FRAMEBUFFER1 and beyond? fbcond 1 2 logd /scheme/debug /scheme/fbcon/1 stdio /scheme/log ramfs logging lived +unset DISK_LIVE_ADDR DISK_LIVE_SIZE redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK +unset REDOXFS_UUID REDOXFS_BLOCK REDOXFS_PASSWORD_ADDR REDOXFS_PASSWORD_SIZE cd / export PATH /usr/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 581476db1..6f109e946 100644 --- a/recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp +++ b/recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp @@ -5,13 +5,17 @@ zerod randd inputd vesad G G G +unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE +#TODO: unset FRAMEBUFFER1 and beyond? fbcond 1 2 logd /scheme/debug /scheme/fbcon/1 stdio /scheme/log ramfs logging lived +unset DISK_LIVE_ADDR DISK_LIVE_SIZE bcm2835-sdhcid redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK +unset REDOXFS_UUID REDOXFS_BLOCK REDOXFS_PASSWORD_ADDR REDOXFS_PASSWORD_SIZE cd / export PATH /usr/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 7837d2371..9f80f6485 100644 --- a/recipes/core/initfs/init.rc +++ b/recipes/core/initfs/init.rc @@ -5,6 +5,8 @@ zerod randd inputd vesad G G G +unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE +#TODO: unset FRAMEBUFFER1 and beyond? fbcond 1 2 logd /scheme/debug /scheme/fbcon/1 stdio /scheme/log @@ -13,7 +15,9 @@ ramfs logging acpid pcid /scheme/initfs/etc/pcid/initfs.toml lived +unset DISK_LIVE_ADDR DISK_LIVE_SIZE redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK +unset REDOXFS_UUID REDOXFS_BLOCK REDOXFS_PASSWORD_ADDR REDOXFS_PASSWORD_SIZE cd / export PATH /usr/bin run.d /usr/lib/init.d /etc/init.d -- GitLab