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

Merge pull request #1064 from erikwilson/fix-module-warnings 

Non-fatal warning for check-config modules
pull/1070/head
Erik Wilson 2019-11-13 18:49:23 -07:00 committed by GitHub
parent 77703b90ff 8edbe30c8c
commit 7b76db1ad4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ possibleConfigs="
"
binDir=$(dirname "$0")
configFormat=gz
isError=0
if [ $# -gt 0 ]; then
CONFIG="$1"
@ -108,7 +109,7 @@ check_flag() {
elif is_set_as_module "$1"; then
wrap_good "CONFIG_$1" 'enabled (as module)'
else
if [ "$IS_ERROR" = 1 ]; then
if [ $isError -eq 1 ]; then
wrap_bad "CONFIG_$1" 'missing'
else
wrap_warn "CONFIG_$1" 'missing'
@ -269,7 +270,7 @@ echo
SUDO=
[ $(id -u) -ne 0 ] && SUDO=sudo
lsmod | grep -q configs || $SUDO modprobe configs || true
lsmod | grep -q configs || $SUDO modprobe configs >/dev/null 2>&1 || true
if [ -z "$CONFIG" ]; then
for tryConfig in ${possibleConfigs}; do
@ -341,7 +342,8 @@ flags="
IP_NF_NAT NF_NAT NF_NAT_NEEDED
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
check_flags DEVPTS_MULTIPLE_INSTANCES
fi