github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Non-fatal warning for check-config modules

pull/1064/head
Erik Wilson 2019-11-13 17:08:15 -07:00
parent ea69b45477
commit c83ec56cbe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/util/check-config.sh
View File

@ -19,6 +19,7 @@ possibleConfigs="
" "
binDir=$(dirname "$0") binDir=$(dirname "$0")
configFormat=gz configFormat=gz
isError=0
if [ $# -gt 0 ]; then if [ $# -gt 0 ]; then
CONFIG="$1" CONFIG="$1"
@ -108,7 +109,7 @@ check_flag() {
elif is_set_as_module "$1"; then elif is_set_as_module "$1"; then
wrap_good "CONFIG_$1" 'enabled (as module)' wrap_good "CONFIG_$1" 'enabled (as module)'
else else
if [ "$IS_ERROR" = 1 ]; then if [ $isError -eq 1 ]; then
wrap_bad "CONFIG_$1" 'missing' wrap_bad "CONFIG_$1" 'missing'
else else
wrap_warn "CONFIG_$1" 'missing' wrap_warn "CONFIG_$1" 'missing'
@ -341,7 +342,8 @@ flags="
IP_NF_NAT NF_NAT NF_NAT_NEEDED IP_NF_NAT NF_NAT NF_NAT_NEEDED
POSIX_MQUEUE POSIX_MQUEUE
" "
IS_ERROR=1 check_flags $flags isError=1 check_flags $flags && isError=0
if [ "$kernelMajor" -lt 4 ] || ( [ "$kernelMajor" -eq 4 ] && [ "$kernelMinor" -lt 8 ] ); then if [ "$kernelMajor" -lt 4 ] || ( [ "$kernelMajor" -eq 4 ] && [ "$kernelMinor" -lt 8 ] ); then
check_flags DEVPTS_MULTIPLE_INSTANCES check_flags DEVPTS_MULTIPLE_INSTANCES
fi fi