InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50555 from chunzhennn/49231-fix-memcg-swap-config-check

Browse Source 
contrib/check-config: fix MEMCG_SWAP checking
This commit is contained in:
Sebastiaan van Stijn
2025-08-05 19:36:26 +02:00
committed by GitHub
parent e7feeb10b9 f866621303
commit 141a97bdf9
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/check-config.sh
View File

@@ -246,11 +246,10 @@ echo 'Optional Features:'
check_flags CGROUP_PIDS check_flags CGROUP_PIDS
} }
{ {
check_flags MEMCG_SWAP # Kernel v5.8+ removes MEMCG_SWAP_ENABLED and deprecates MEMCG_SWAP.
# Kernel v5.8+ removes MEMCG_SWAP_ENABLED. if [ "$kernelMajor" -lt 5 ] || [ "$kernelMajor" -eq 5 -a "$kernelMinor" -lt 8 ]; then
if [ "$kernelMajor" -lt 5 ] || [ "$kernelMajor" -eq 5 -a "$kernelMinor" -le 8 ]; then
CODE=${EXITCODE} CODE=${EXITCODE}
check_flags MEMCG_SWAP_ENABLED check_flags MEMCG_SWAP MEMCG_SWAP_ENABLED
# FIXME this check is cgroupv1-specific # FIXME this check is cgroupv1-specific
if [ -e /sys/fs/cgroup/memory/memory.memsw.limit_in_bytes ]; then if [ -e /sys/fs/cgroup/memory/memory.memsw.limit_in_bytes ]; then
echo " $(wrap_color '(cgroup swap accounting is currently enabled)' bold black)" echo " $(wrap_color '(cgroup swap accounting is currently enabled)' bold black)"