From: Renaud Métrich <rmetrich@redhat.com>
Date: Wed, 14 Nov 2018 12:19:27 +0000 (+0100)
Subject: fips: removed false-positive 'FATAL: Module xxx not found' error message when kernel... 
X-Git-Tag: 050~257
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01ffcf342ae65984c655f10a2fd35019a492ee5c;p=thirdparty%2Fdracut.git

fips: removed false-positive 'FATAL: Module xxx not found' error message when kernel provides a generic algo for module

Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
---

diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
index 9bc089f21..c6c986cf7 100755
--- a/modules.d/01fips/fips.sh
+++ b/modules.d/01fips/fips.sh
@@ -84,7 +84,7 @@ do_fips()
     mv /etc/modprobe.d/fips.conf /etc/modprobe.d/fips.conf.bak
     for _module in $FIPSMODULES; do
         if [ "$_module" != "tcrypt" ]; then
-            if ! modprobe "${_module}"; then
+            if ! modprobe "${_module}" 2>/tmp/fips.modprobe_err; then
                 # check if kernel provides generic algo
                 _found=0
                 while read _k _s _v || [ -n "$_k" ]; do
@@ -93,7 +93,7 @@ do_fips()
                     _found=1
                     break
                 done </proc/crypto
-                [ "$_found" = "0" ] && return 1
+                [ "$_found" = "0" ] && cat /tmp/fips.modprobe_err >&2 && return 1
             fi
         fi
     done