userutils, uutils, zerod: use /usr/bin

This commit is contained in:
Jeremy Soller 2024-01-08 14:52:07 -07:00
parent ca86a9d162
commit 21c62f8d89
No known key found for this signature in database
GPG Key ID: DCFCA852D3906975
3 changed files with 7 additions and 7 deletions

View File

@ -6,8 +6,8 @@ template = "custom"
script = """
cookbook_cargo
cp -rv "${COOKBOOK_SOURCE}/res" "${COOKBOOK_STAGE}/etc"
ln -s id "${COOKBOOK_STAGE}/bin/whoami"
chmod +s "${COOKBOOK_STAGE}/bin/passwd"
chmod +s "${COOKBOOK_STAGE}/bin/sudo"
chmod +s "${COOKBOOK_STAGE}/bin/su"
ln -s id "${COOKBOOK_STAGE}/usr/bin/whoami"
chmod +s "${COOKBOOK_STAGE}/usr/bin/passwd"
chmod +s "${COOKBOOK_STAGE}/usr/bin/sudo"
chmod +s "${COOKBOOK_STAGE}/usr/bin/su"
"""

View File

@ -80,6 +80,6 @@ BINS=(
for bin in "${BINS[@]}"
do
ln -sv coreutils "${COOKBOOK_STAGE}/bin/$bin"
ln -sv coreutils "${COOKBOOK_STAGE}/usr/bin/$bin"
done
"""

View File

@ -7,7 +7,7 @@ script = """
cookbook_cargo --bin zerod
# TODO: symlinks aren't supported by redox-initfs
#ln -sv zerod "${COOKBOOK_STAGE}/bin/nulld"
#ln -sv zerod "${COOKBOOK_STAGE}/usr/bin/nulld"
cp "${COOKBOOK_STAGE}/bin/zerod" "${COOKBOOK_STAGE}/bin/nulld"
cp "${COOKBOOK_STAGE}/usr/bin/zerod" "${COOKBOOK_STAGE}/usr/bin/nulld"
"""