From ffc6d8d3dd94e3bda303a359574f939e9dc52f9c Mon Sep 17 00:00:00 2001 From: Joakim Roubert Date: Mon, 24 May 2021 10:56:04 +0200 Subject: contrib/check-config.sh: Remove awk dependency The awk dependency is an issue when running check-config.sh on systems without awk. The use of awk can be replaced with sed, which improves portability. The PR code review discussion iterated via grep to this final sed version that is all Tianon Gravi's art. Co-authored-by: Tianon Gravi Signed-off-by: Joakim Roubert --- contrib/check-config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/check-config.sh b/contrib/check-config.sh index 09c2c91d5f..4240684bc9 100755 --- a/contrib/check-config.sh +++ b/contrib/check-config.sh @@ -163,7 +163,7 @@ printf -- '- ' if [ "$(stat -f -c %t /sys/fs/cgroup 2> /dev/null)" = '63677270' ]; then wrap_good 'cgroup hierarchy' 'cgroupv2' else - cgroupSubsystemDir="$(awk '/[, ](cpu|cpuacct|cpuset|devices|freezer|memory)[, ]/ && $3 == "cgroup" { print $2 }' /proc/mounts | head -n1)" + cgroupSubsystemDir="$(sed -rne '/^[^ ]+ ([^ ]+) cgroup ([^ ]*,)?(cpu|cpuacct|cpuset|devices|freezer|memory)[, ].*$/ { s//\1/p; q }' /proc/mounts)" cgroupDir="$(dirname "$cgroupSubsystemDir")" if [ -d "$cgroupDir/cpu" ] || [ -d "$cgroupDir/cpuacct" ] || [ -d "$cgroupDir/cpuset" ] || [ -d "$cgroupDir/devices" ] || [ -d "$cgroupDir/freezer" ] || [ -d "$cgroupDir/memory" ]; then echo "$(wrap_good 'cgroup hierarchy' 'properly mounted') [$cgroupDir]" -- cgit v1.2.1