Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion tools-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,11 @@ RUN set -eux; \
/tools-rootfs/agentenv/bin/busybox --list | grep -qx 'runsv' || \
{ echo "BusyBox runsv applet missing; rebuild with CONFIG_RUNSV=y" >&2; exit 1; }; \
/tools-rootfs/agentenv/bin/busybox --list | grep -qx 'svlogd' || \
{ echo "BusyBox svlogd applet missing; rebuild with CONFIG_SVLOGD=y" >&2; exit 1; }
{ echo "BusyBox svlogd applet missing; rebuild with CONFIG_SVLOGD=y" >&2; exit 1; }; \
/tools-rootfs/agentenv/bin/busybox --list | grep -qx 'nice' || \
{ echo "BusyBox nice applet missing; rebuild with CONFIG_NICE=y" >&2; exit 1; }; \
/tools-rootfs/agentenv/bin/busybox --list | grep -qx 'ionice' || \
{ echo "BusyBox ionice applet missing; rebuild with CONFIG_IONICE=y" >&2; exit 1; }

# ---------------------------------------------------------------------------
# Stage 3: materialize the rootfs as an ext4 disk image.
Expand Down
10 changes: 7 additions & 3 deletions tools-image/pivot-init
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,17 @@ fi
# Expose envd as a stable guest command.
$BB ln -sf /agentenv/envd /usr/local/bin/envd

# envd 0.5.x starts guest processes through /usr/bin/nice. Minimal user images
# do not always ship coreutils, so provide a BusyBox-backed fallback without
# overriding an image that already has a real nice(1).
# envd wraps guest processes in `/usr/bin/ionice ... /usr/bin/nice ...`. Minimal
# user images (Alpine/musl, distroless, FROM scratch) do not always ship
# coreutils or util-linux, so provide BusyBox-backed fallbacks without
# overriding an image that already has real nice(1)/ionice(1).
$BB mkdir -p /usr/bin
if [ ! -x /usr/bin/nice ]; then
$BB ln -sf /agentenv/bin/busybox /usr/bin/nice
fi
if [ ! -x /usr/bin/ionice ]; then
$BB ln -sf /agentenv/bin/busybox /usr/bin/ionice
fi

# Prepare remaining runtime directories envd and the guest init commonly
# expect (/run is already mounted above as a tmpfs).
Expand Down
Loading