File 0622-01fips-modprobe-failures-during-manual-mod... of Package dracut

Overview Repositories Revisions Requests Users Attributes Meta

File 0622-01fips-modprobe-failures-during-manual-module-loadin.patch of Package dracut

From 8506e86fedb4073fced14a5cd65e4c9f45874079 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolkentin@suse.com>
Date: Mon, 6 Jul 2020 14:47:28 +0200
Subject: [PATCH] 01fips: modprobe failures during manual module loading is not
 fatal

Users might see

"modprobe: FATAL: Module xyz not found in directory"

The output from modprobe is semantically wrong in this case and
confuses users. Keep the warning for debugging purposes, but reduce
the severeness.

It now reads "Module xyz not found in directory"

Reference: bsc#1169997
---
 modules.d/01fips/fips.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Index: dracut-044/modules.d/01fips/fips.sh
===================================================================
--- dracut-044.orig/modules.d/01fips/fips.sh
+++ dracut-044/modules.d/01fips/fips.sh
@@ -73,6 +73,14 @@ do_rhevh_check()
     return 0
 }
 
+nonfatal_modprobe()
+{
+    modprobe $1 2>&1 > /dev/stdout |
+        while read -r line || [ -n "$line" ]; do
+            echo "${line#modprobe: FATAL: }" >&2
+        done
+}
+
 do_fips()
 {
     local _v
@@ -119,7 +127,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 ! nonfatal_modprobe "${_module}"; then
                 # check if kernel provides generic algo
                 _found=0
                 while read _k _s _v || [ -n "$_k" ]; do

Places

File 0622-01fips-modprobe-failures-during-manual-module-loadin.patch of Package dracut

Places