From c83ec56cbeb1a2b67558da7c4d180af9aad2b67c Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Wed, 13 Nov 2019 17:08:15 -0700 Subject: [PATCH 1/2] Non-fatal warning for check-config modules --- contrib/util/check-config.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/util/check-config.sh b/contrib/util/check-config.sh index c56fd3a346..c5f9dd3cd7 100755 --- a/contrib/util/check-config.sh +++ b/contrib/util/check-config.sh @@ -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' @@ -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 From 8edbe30c8c3a516a2febc7e4c6edb34867aab435 Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Wed, 13 Nov 2019 17:39:02 -0700 Subject: [PATCH 2/2] Silence modprobe warnings --- contrib/util/check-config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/util/check-config.sh b/contrib/util/check-config.sh index c5f9dd3cd7..1a5c7cba6e 100755 --- a/contrib/util/check-config.sh +++ b/contrib/util/check-config.sh @@ -270,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