Marcus Meissner
0f203926a1
- Rename patch:
* From 0211-fix_multipath_check_hostonly.patch
to 0303-fix_multipath_check_hostonly.patch
- Rename patch:
* From 0213-10i18n-keymap-find.patch
to 0213-Fix-wrong-keymap-inclusion.patch
- 95fcoe: Do not complain about missing /etc/hba.conf (bsc#980539)
* Add 0215-95fcoe-Do-not-complain-about-missing-etc-hba.conf.patch
- 95fcoe: silence lldpad warnings
* Add 0216-95fcoe-silence-lldpad-warnings.patch
- 95fcoe: Allow to specify the FCoE mode via the fcoe= parameter
* Add 0217-95fcoe-Allow-to-specify-the-FCoE-mode-via-the-fcoe-p.patch
- 40network: allow persistent interface names (bsc#995284)
* Add 0218-40network-allow-persistent-interface-names.patch
- 95fcoe: use interface names instead of MAC addresses
* Add 0219-95fcoe-use-interface-names-instead-of-MAC-addresses.patch
- 95fcoe: always set AUTO_VLAN for fcoemon (bsc#995019)
* Add 0220-95fcoe-always-set-AUTO_VLAN-for-fcoemon.patch
- 95fcoe: Add shutdown script (bsc#994860)
* Add 0221-95fcoe-Add-shutdown-script.patch
- 90dm: Fixup shutdown script (bsc#994860)
* Add 0222-90dm-Fixup-shutdown-script.patch
- 90dm: fixup dependency cycle between MD and DM shutdown (bsc#994860)
* Add 0223-90dm-fixup-dependency-cycle-between-MD-and-DM-shutdo.patch
- 90multipath: Start daemon after udev settle (bsc#986734)
* Add 0304-90multipath-Start-daemon-after-udev-settle.patch
- 90multipath: load dm_multipath module during startup
* Add 0305-90multipath-load-dm_multipath-module-during-startup.patch
- 90multipath: add shutdown script (bsc#994860)
OBS-URL: https://build.opensuse.org/request/show/422869
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=263
98 lines
2.8 KiB
Diff
98 lines
2.8 KiB
Diff
From 2e176c1a99db334756c91c6c0e10e029993e56c7 Mon Sep 17 00:00:00 2001
|
|
From: Fabian Vogt <fvogt@suse.com>
|
|
Date: Tue, 3 Nov 2015 17:25:44 +0100
|
|
Subject: [PATCH] Accumulate kernel module installation failures
|
|
|
|
- Port 0169-Enabled-Warning-for-failed-kernel-modules-per-defaul.patch:
|
|
Subject: Enable warning for failed kernel moduiles
|
|
|
|
Enabled Warning for failed kernel modules per default
|
|
and added summary of those to the end of dracut output
|
|
|
|
References: bnc#886839
|
|
|
|
- Disable inline warnings in favour of summary
|
|
|
|
Signed-off-by: Fabian Vogt <fvogt@suse.com>
|
|
---
|
|
dracut-init.sh | 8 +++++---
|
|
dracut.sh | 15 +++++++++++++++
|
|
2 files changed, 20 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/dracut-init.sh b/dracut-init.sh
|
|
index 9689c0b..0fda778 100644
|
|
--- a/dracut-init.sh
|
|
+++ b/dracut-init.sh
|
|
@@ -1084,14 +1084,16 @@ instmods() {
|
|
[[ $no_kernel = yes ]] && return
|
|
# called [sub]functions inherit _fderr
|
|
local _fderr=9
|
|
- local _check=no
|
|
+ local _check=yes
|
|
local _silent=no
|
|
+
|
|
if [[ $1 = '-c' ]]; then
|
|
_check=yes
|
|
shift
|
|
fi
|
|
|
|
if [[ $1 = '-s' ]]; then
|
|
+ _check=no
|
|
_silent=yes
|
|
shift
|
|
fi
|
|
@@ -1173,7 +1175,7 @@ instmods() {
|
|
while read _mod || [ -n "$_mod" ]; do
|
|
inst1mod "${_mod%.ko*}" || {
|
|
if [[ "$_check" == "yes" ]] && [[ "$_silent" == "no" ]]; then
|
|
- dfatal "Failed to install module $_mod"
|
|
+ echo $_mod >> $tmp_dracut_failed_drivers
|
|
fi
|
|
}
|
|
done
|
|
@@ -1181,7 +1183,7 @@ instmods() {
|
|
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
|
|
}
|
|
shift
|
|
diff --git a/dracut.sh b/dracut.sh
|
|
index 12b253d..d7dc9ff 100755
|
|
--- a/dracut.sh
|
|
+++ b/dracut.sh
|
|
@@ -390,6 +390,12 @@ verbosity_mod_l=0
|
|
unset kernel
|
|
unset outfile
|
|
|
|
+if ! tmp_dracut_failed_drivers=$(mktemp /tmp/dracut.XXXXXXXXXX); then
|
|
+ echo "Could not create temporary file"
|
|
+ exit 1
|
|
+fi
|
|
+export tmp_dracut_failed_drivers
|
|
+
|
|
rearrange_params "$@"
|
|
eval set -- "$TEMP"
|
|
|
|
@@ -1761,6 +1767,15 @@ if ! (
|
|
exit 1
|
|
fi
|
|
|
|
+if [[ -s $tmp_dracut_failed_drivers ]]; then
|
|
+ dwarn "Some kernel modules could not be included"
|
|
+ dwarn "This is not necessarily an error:"
|
|
+ while read line; do
|
|
+ dwarn "$line"
|
|
+ done < $tmp_dracut_failed_drivers
|
|
+fi
|
|
+rm $tmp_dracut_failed_drivers
|
|
+
|
|
if (( maxloglvl >= 5 )); then
|
|
if [[ $allowlocal ]]; then
|
|
"$dracutbasedir/lsinitrd.sh" "${DRACUT_TMPDIR}/initramfs.img"| ddebug
|
|
--
|
|
2.6.6
|
|
|