Fix regression from commit 137e80cd

Problem: A false-negative in check-config.sh for cgroups v2 systems was fixed but the commit introduced a regression based on a small assumption that content of /sys/fs/cgroup/cgroup.controllers would have the same format as the content of /proc/self/cgroup. It doesn't. Solution: This just tweaks the regex to count occurrences of either cgroup subsystem-names on each line (as occurs in the sysfs pseudo-file), or those names with colons either side (as occurs in the procfs pseudo-file). Signed-off-by: Rowan Thorpe <rowan@rowanthorpe.com>

Fix regression from commit 137e80cd
dccee4e8 · Rowan Thorpe · Brad Davidson · 7a36c3f7 · dccee4e8
Commit dccee4e8 authored Sep 17, 2021 by Rowan Thorpe Committed by Brad Davidson Sep 17, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

check-config.sh contrib/util/check-config.sh +1 -1

No files found.
--- a/contrib/util/check-config.sh
+++ b/contrib/util/check-config.sh
@@ -341,7 +341,7 @@ case "${cgroupVariant}" in
        cgroupFile='/proc/self/cgroup'
        ;;
    esac
-    if [ "$(tr -s ' ' '\n' <"${cgroupFile}" 2>/dev/null | grep -Ec "^(${cgroupMatch})\$")" -eq ${cgroupMatchNum} ]; then
+    if [ "$(tr -s ' ' '\n' <"${cgroupFile}" 2>/dev/null | grep -Ec "(^|:)(${cgroupMatch})(\$|:)")" -eq ${cgroupMatchNum} ]; then
      cgroupStatus='good'
    else
      cgroupStatus='bad'