Skip to content

K
k3s
Unverified Commit 7b76db1a authored by Erik Wilson's avatar Erik Wilson Committed by GitHub
Browse files
Options

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

Non-fatal warning for check-config modules
parents 77703b90 8edbe30c
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
contrib/util/check-config.sh
View file @ 7b76db1a
...@@ -19,6 +19,7 @@ possibleConfigs=" ...@@ -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() { ...@@ -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'
...@@ -269,7 +270,7 @@ echo ...@@ -269,7 +270,7 @@ echo
SUDO= SUDO=
[ $(id -u) -ne 0 ] && SUDO=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 if [ -z "$CONFIG" ]; then
for tryConfig in ${possibleConfigs}; do for tryConfig in ${possibleConfigs}; do
...@@ -341,7 +342,8 @@ flags=" ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment