mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

script/check-config.sh: fix SC2166 warnings

Browse Source 
Like this one:

	In ./script/check-config.sh line 215:
	if [ "$kernelMajor" -lt 5 ] || [ "$kernelMajor" -eq 5 -a "$kernelMinor" -le 1 ]; then
							      ^-- SC2166 (warning): Prefer [ p ] && [ q ] as [ p -a q ] is not well defined.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2022-02-16 13:25:27 -08:00
parent dc73d236ea
commit baa06227a4
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/check-config.sh
+13 -8
View File
@@ -27,6 +27,11 @@ kernelMajor="${kernelVersion%%.*}"
kernelMinor="${kernelVersion#$kernelMajor.}" kernelMinor="${kernelVersion#$kernelMajor.}"
kernelMinor="${kernelMinor%%.*}" kernelMinor="${kernelMinor%%.*}"
kernel_lt() {
[ "$kernelMajor" -lt "$1" ] && return
[ "$kernelMajor" -eq "$1" ] && [ "$kernelMinor" -le "$2" ]
}
is_set() { is_set() {
zgrep "CONFIG_$1=[y|m]" "$CONFIG" >/dev/null zgrep "CONFIG_$1=[y|m]" "$CONFIG" >/dev/null
} }
@@ -178,7 +183,7 @@ if [ "$(stat -f -c %t /sys/fs/cgroup 2>/dev/null)" = "63677270" ]; then
else else
cgroupSubsystemDir="$(awk '/[, ](cpu|cpuacct|cpuset|devices|freezer|memory)[, ]/ && $3 == "cgroup" { print $2 }' /proc/mounts | head -n1)" cgroupSubsystemDir="$(awk '/[, ](cpu|cpuacct|cpuset|devices|freezer|memory)[, ]/ && $3 == "cgroup" { print $2 }' /proc/mounts | head -n1)"
cgroupDir="$(dirname "$cgroupSubsystemDir")" cgroupDir="$(dirname "$cgroupSubsystemDir")"
if [ -d "$cgroupDir/cpu" -o -d "$cgroupDir/cpuacct" -o -d "$cgroupDir/cpuset" -o -d "$cgroupDir/devices" -o -d "$cgroupDir/freezer" -o -d "$cgroupDir/memory" ]; then if [ -d "$cgroupDir/cpu" ] || [ -d "$cgroupDir/cpuacct" ] || [ -d "$cgroupDir/cpuset" ] || [ -d "$cgroupDir/devices" ] || [ -d "$cgroupDir/freezer" ] || [ -d "$cgroupDir/memory" ]; then
wrap_good 'cgroup hierarchy' 'properly mounted' "[$cgroupDir]" wrap_good 'cgroup hierarchy' 'properly mounted' "[$cgroupDir]"
else else
if [ "$cgroupSubsystemDir" ]; then if [ "$cgroupSubsystemDir" ]; then
@@ -221,11 +226,11 @@ flags=(
) )
check_flags "${flags[@]}" check_flags "${flags[@]}"
if [ "$kernelMajor" -lt 5 ] || [ "$kernelMajor" -eq 5 -a "$kernelMinor" -le 1 ]; then if kernel_lt 5 1; then
check_flags NF_NAT_IPV4 check_flags NF_NAT_IPV4
fi fi
if [ "$kernelMajor" -lt 5 ] || [ "$kernelMajor" -eq 5 -a "$kernelMinor" -le 2 ]; then if kernel_lt 5 2; then
check_flags NF_NAT_NEEDED check_flags NF_NAT_NEEDED
fi fi
@@ -242,7 +247,7 @@ echo 'Optional Features:'
check_flags MEMCG_SWAP check_flags MEMCG_SWAP
if [ "$kernelMajor" -lt 5 ] || [ "$kernelMajor" -eq 5 -a "$kernelMinor" -le 8 ]; then if kernel_lt 5 8; then
check_flags MEMCG_SWAP_ENABLED check_flags MEMCG_SWAP_ENABLED
if is_set MEMCG_SWAP && ! is_set MEMCG_SWAP_ENABLED; then if is_set MEMCG_SWAP && ! is_set MEMCG_SWAP_ENABLED; then
wrap_color ' (note that cgroup swap accounting is not enabled in your kernel config, you can enable it by setting boot option "swapaccount=1")' bold black wrap_color ' (note that cgroup swap accounting is not enabled in your kernel config, you can enable it by setting boot option "swapaccount=1")' bold black
@@ -250,21 +255,21 @@ echo 'Optional Features:'
fi fi
} }
if [ "$kernelMajor" -lt 4 ] || [ "$kernelMajor" -eq 4 -a "$kernelMinor" -le 5 ]; then if kernel_lt 4 5; then
check_flags MEMCG_KMEM check_flags MEMCG_KMEM
fi fi
if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 18 ]; then if kernel_lt 3 18; then
check_flags RESOURCE_COUNTERS check_flags RESOURCE_COUNTERS
fi fi
if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 13 ]; then if kernel_lt 3 13; then
netprio=NETPRIO_CGROUP netprio=NETPRIO_CGROUP
else else
netprio=CGROUP_NET_PRIO netprio=CGROUP_NET_PRIO
fi fi
if [ "$kernelMajor" -lt 5 ]; then if kernel_lt 5 0; then
check_flags IOSCHED_CFQ CFQ_GROUP_IOSCHED check_flags IOSCHED_CFQ CFQ_GROUP_IOSCHED
fi fi