diff --git a/config/base.toml b/config/base.toml index 6fec395c0..dff9bea33 100644 --- a/config/base.toml +++ b/config/base.toml @@ -23,10 +23,6 @@ uutils = {} [[files]] path = "/usr/lib/init.d/00_base" data = """ -# clear and recreate tmpdir with 0o1777 permission -rm -rf /tmp -mkdir -m a=rwxt /tmp - ipcd ptyd nowait sudo --daemon @@ -38,6 +34,12 @@ data = """ pcid-spawner /etc/pcid.d/ """ +[[files]] +path = "/usr/lib/init.d/00_tmp" +data = """ +ramfs tmp +""" + [[files]] path = "/etc/hostname" data = "redox" @@ -168,12 +170,16 @@ directory = true mode = 0o755 [[files]] -path = "/var/tmp" -data = "" -directory = true -mode = 0o1777 +path = "/tmp" +data = "/scheme/tmp" +symlink = true ## Device file symlinks +[[files]] +path = "/var/tmp" +data = "/scheme/tmp" +symlink = true + [[files]] path = "/dev/null" data = "/scheme/null" diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml index 2afacf3a0..a8618bae5 100644 --- a/recipes/core/base/recipe.toml +++ b/recipes/core/base/recipe.toml @@ -39,6 +39,7 @@ BINS=( virtio-netd xhcid inputd + ramfs redoxerd ) @@ -61,11 +62,14 @@ 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" || "${bin}" == "pcid-spawner" || "${bin}" == "redoxerd" ]]; then + case "${bin}" in + inputd | pcid | pcid-spawner | ramfs | redoxerd) cp -v "target/${TARGET}/${build_type}/${bin}" "${COOKBOOK_STAGE}/usr/bin" - else + ;; + *) cp -v "target/${TARGET}/${build_type}/${bin}" "${COOKBOOK_STAGE}/usr/lib/drivers" - fi + ;; + esac done mkdir -pv "${COOKBOOK_STAGE}/etc/pcid"