diff --git a/recipes/core/base-initfs/aarch64-unknown-redox/init_drivers.rc b/recipes/core/base-initfs/aarch64-unknown-redox/init_drivers.rc deleted file mode 100644 index 81a8d14c2..000000000 --- a/recipes/core/base-initfs/aarch64-unknown-redox/init_drivers.rc +++ /dev/null @@ -1,2 +0,0 @@ -hwd -pcid-spawner /etc/pcid/initfs.toml diff --git a/recipes/core/base-initfs/aarch64-unknown-redox/init_drivers.rc.raspi3bp b/recipes/core/base-initfs/aarch64-unknown-redox/init_drivers.rc.raspi3bp deleted file mode 100644 index ae9b17a45..000000000 --- a/recipes/core/base-initfs/aarch64-unknown-redox/init_drivers.rc.raspi3bp +++ /dev/null @@ -1 +0,0 @@ -bcm2835-sdhcid diff --git a/recipes/core/base-initfs/init.rc b/recipes/core/base-initfs/init.rc deleted file mode 100644 index 6fb3094f7..000000000 --- a/recipes/core/base-initfs/init.rc +++ /dev/null @@ -1,40 +0,0 @@ -# Various daemons that relibc needs to function as well as a bunch of env vars -# that should be set for every program. -export PATH /bin -export RUST_BACKTRACE 1 -rtcd -nulld -zerod -randd - -# Logging -logd -stdio /scheme/log -ramfs logging - -# Graphics infrastructure -inputd -vesad -unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE -#TODO: unset FRAMEBUFFER1 and beyond? -fbbootlogd -inputd -A 1 -fbcond 2 - -# Live disk -# Note: Needs to start before drivers to ensure it gets priority when redoxfs searches for disks -lived - -# Drivers -run /scheme/initfs/etc/init_drivers.rc -unset RSDP_ADDR RSDP_SIZE - -# Mount rootfs -redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK -unset REDOXFS_UUID REDOXFS_BLOCK REDOXFS_PASSWORD_ADDR REDOXFS_PASSWORD_SIZE - -# Exit initfs -set-default-scheme file -cd / -export PATH /usr/bin -run.d /usr/lib/init.d /etc/init.d diff --git a/recipes/core/base-initfs/init_drivers.rc b/recipes/core/base-initfs/init_drivers.rc deleted file mode 100644 index 586b45ac8..000000000 --- a/recipes/core/base-initfs/init_drivers.rc +++ /dev/null @@ -1,3 +0,0 @@ -ps2d us -hwd -pcid-spawner /etc/pcid/initfs.toml diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml index 0bb632940..2e0618185 100644 --- a/recipes/core/base-initfs/recipe.toml +++ b/recipes/core/base-initfs/recipe.toml @@ -68,13 +68,12 @@ esac rm -rf "${COOKBOOK_BUILD}/initfs" mkdir -p "${COOKBOOK_BUILD}/initfs/etc" -# TODO: Move init.rc to another recipe, perhaps initfs-misc? Then it can be installed as a regular dependency. -cp "${COOKBOOK_RECIPE}/init.rc" "${COOKBOOK_BUILD}/initfs/etc/init.rc" -cp "${COOKBOOK_RECIPE}/init_drivers.rc" "${COOKBOOK_BUILD}/initfs/etc/init_drivers.rc" -if [ -e ${COOKBOOK_RECIPE}/${TARGET}/init_drivers.rc.${BOARD} ]; then - cp "${COOKBOOK_RECIPE}/${TARGET}/init_drivers.rc.${BOARD}" "${COOKBOOK_BUILD}/initfs/etc/init_drivers.rc" -elif [ -e ${COOKBOOK_RECIPE}/${TARGET}/init_drivers.rc ]; then - cp "${COOKBOOK_RECIPE}/${TARGET}/init_drivers.rc" "${COOKBOOK_BUILD}/initfs/etc/init_drivers.rc" +cp "${COOKBOOK_SOURCE}/init.rc" "${COOKBOOK_BUILD}/initfs/etc/init.rc" +cp "${COOKBOOK_SOURCE}/init_drivers.rc" "${COOKBOOK_BUILD}/initfs/etc/init_drivers.rc" +if [ -e ${COOKBOOK_SOURCE}/${TARGET}/init_drivers.rc.${BOARD} ]; then + cp "${COOKBOOK_SOURCE}/${TARGET}/init_drivers.rc.${BOARD}" "${COOKBOOK_BUILD}/initfs/etc/init_drivers.rc" +elif [ -e ${COOKBOOK_SOURCE}/${TARGET}/init_drivers.rc ]; then + cp "${COOKBOOK_SOURCE}/${TARGET}/init_drivers.rc" "${COOKBOOK_BUILD}/initfs/etc/init_drivers.rc" fi mkdir -pv "${COOKBOOK_BUILD}/initfs/etc/pcid"