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

k3d-io · Aug 2, 2024 · 60695db · 60695db
1 parent 6ad4fe0
commit 60695db
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/pkg/types/fixes/assets/k3d-entrypoint-cgroupv2.sh b/pkg/types/fixes/assets/k3d-entrypoint-cgroupv2.sh
@@ -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"