File 0311-less_pointless_module_errors.patch of Package dracut.4406
From 4b9b4eb26b1f6852857bc72faaa04480c001eb81 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Mon, 9 Nov 2015 13:04:27 +0100
Subject: [PATCH] Print less pointless warnings about module install failures
- Don't print the message in-line, use the summary at the end
- Don't fail if module is built-in
- Fixes bsc#952491 and bsc#935563
Signed-off-by: Fabian Vogt <fvogt@suse.com>
---
dracut-functions.sh | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
Index: dracut-037/dracut-functions.sh
===================================================================
--- dracut-037.orig/dracut-functions.sh
+++ dracut-037/dracut-functions.sh
@@ -1668,6 +1668,12 @@ instmods() {
--*) _mpargs+=" $_mod" ;;
*)
_mod=${_mod##*/}
+
+ if grep -q "/${_mod}.ko" /lib/modules/$kernel/modules.builtin; then
+ # Module is built-in
+ return 0
+ fi
+
# Check for aliased modules
_modalias=$(modinfo -k $kernel -F filename $_mod 2> /dev/null)
_modalias=${_modalias%.ko*}
@@ -1727,18 +1733,16 @@ instmods() {
while read _mod; do
inst1mod "${_mod%.ko*}" || {
if [[ "$_check" == "yes" ]] && [[ "$_silent" == "no" ]]; then
- dfatal "Failed to install module $_mod"
+ echo $_mod >> $tmp_dracut_failed_drivers
fi
- echo $_mod >> $tmp_dracut_failed_drivers
}
done
fi
while (($# > 0)); do # filenames as arguments
inst1mod ${1%.ko*} || {
if [[ "$_check" == "yes" ]] && [[ "$_silent" == "no" ]]; then
- dfatal "Failed to install module $1"
+ echo $1 >> $tmp_dracut_failed_drivers
fi
- echo $1 >> $tmp_dracut_failed_drivers
}
shift
done