Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: k3d-io/k3d
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.7.2
Choose a base ref
...
head repository: k3d-io/k3d
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.7.3
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 2, 2024

  1. fix: busybox xargs unlinked on new k3s releases (#1479)

    @thejan2009
    thejan2009 authored Aug 2, 2024
    Loading
    Loading status checks…

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    60695db View commit details

  2. Deploying to main from @ 60695db 🚀

    @iwilltry42
    iwilltry42 committed Aug 2, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    41c29ff View commit details
Showing with 8 additions and 3 deletions.
  1. +1 −1 README.md
  2. +7 −2 pkg/types/fixes/assets/k3d-entrypoint-cgroupv2.sh
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -184,5 +184,5 @@ This project follows the [all-contributors](https://github.com/all-contributors/
Thanks to all our amazing sponsors! 🙏

<ul>
<!-- sponsors --><li><a href="https://github.com/dwightgunning">[<strong>dwightgunning</strong>]</a> Dwight Gunning</li><li><a href="https://github.com/jpfyoder">[<strong>jpfyoder</strong>]</a> Joshua Yoder</li><!-- sponsors -->
<!-- sponsors --><li><a href="">[<strong>dwightgunning</strong>]</a> Dwight Gunning</li><li><a href="">[<strong>jpfyoder</strong>]</a> Joshua Yoder</li><!-- sponsors -->
</ul>
9 changes: 7 additions & 2 deletions pkg/types/fixes/assets/k3d-entrypoint-cgroupv2.sh
View file
Original file line number Diff line number Diff line change
@@ -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"