Skip to content

Commit

Permalink
fix: busybox xargs unlinked on new k3s releases
Browse files Browse the repository at this point in the history
Since rancher/k3s:v1.30.3-k3s1, busybox xargs has been unlinked in
favour of findutils xargs, see
k3s-io/k3s-root#65.

Fixes k3d-io#1478
  • Loading branch information
thejan2009 committed Aug 2, 2024
1 parent 6ad4fe0 commit d829ad5
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions pkg/types/fixes/assets/k3d-entrypoint-cgroupv2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@ set -o nounset
#########################################################################################################################################
if [ -f /sys/fs/cgroup/cgroup.controllers ]; then
echo "[$(date -Iseconds)] [CgroupV2 Fix] Evacuating Root Cgroup ..."
# move the processes from the root group to the /init group,
# move the processes from the root group to the /init group,
# otherwise writing subtree_control fails with EBUSY.
mkdir -p /sys/fs/cgroup/init
busybox xargs -rn1 < /sys/fs/cgroup/cgroup.procs > /sys/fs/cgroup/init/cgroup.procs || :
# new k3s releases only have xargs from findutils
if command -v xargs >/dev/null; then
xargs -rn1 </sys/fs/cgroup/cgroup.procs >/sys/fs/cgroup/init/cgroup.procs || :
else
busybox xargs -rn1 </sys/fs/cgroup/cgroup.procs >/sys/fs/cgroup/init/cgroup.procs || :
fi
# enable controllers
sed -e 's/ / +/g' -e 's/^/+/' <"/sys/fs/cgroup/cgroup.controllers" >"/sys/fs/cgroup/cgroup.subtree_control"
echo "[$(date -Iseconds)] [CgroupV2 Fix] Done"
Expand Down

0 comments on commit d829ad5

Please sign in to comment.