!65 fix issue of iscsi_tcp and sha256 not found

From: @lunankun
Reviewed-by: @t_feng
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2020-11-28 17:06:22 +08:00 committed by Gitee
commit 1e072253d7
2 changed files with 32 additions and 1 deletions

View File

@ -1,7 +1,7 @@
%define _empty_manifest_terminate_build 0
Name: anaconda
Version: 33.19
Release: 12
Release: 13
Summary: Graphical system installer
License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda
@ -40,6 +40,7 @@ Patch9023: bugfix-add-dnf-transaction-timeout.patch
Patch6007: fix-0-storage-devices-selected.patch
Patch6008: fix-remove-unknow-partition-is-sda-failed.patch
Patch6009: use-modinfo-to-check-ko-before-modprobe.patch
%define dbusver 1.2.3
%define dnfver 3.6.0
@ -253,6 +254,12 @@ update-desktop-database &> /dev/null || :
%{_datadir}/gtk-doc
%changelog
* Sat Nov 28 2020 lunankun <lunankun@huawei.com> - 33.19-13
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix issue of iscsi_tcp and sha256 not found
* Mon Oct 26 2020 fengtao <fengtao40@huawei.com> - 33.19-12
- Type:bugfix
- ID:NA

View File

@ -0,0 +1,24 @@
From 9f6c2300b7b4c9671275159d6355c731574120ba Mon Sep 17 00:00:00 2001
From: ft272781150 <t.feng94@foxmail.com>
Date: Thu, 11 Jun 2020 10:19:49 +0800
Subject: [PATCH] Use modinfo to check ko before modprobe
---
dracut/anaconda-modprobe.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dracut/anaconda-modprobe.sh b/dracut/anaconda-modprobe.sh
index 8dd9ab36e7..39c47776c4 100755
--- a/dracut/anaconda-modprobe.sh
+++ b/dracut/anaconda-modprobe.sh
@@ -38,6 +38,10 @@ MODULE_LIST+=" raid0 raid1 raid5 raid6 raid456 raid10 linear dm-mod dm-zero \
sha256 lrw xts "
for m in $MODULE_LIST; do
+ if ! modinfo $m >/dev/null 2>&1 ; then
+ echo "anaconda-modprobe: Module $m not found" >&2
+ continue
+ fi
if modprobe $m ; then
debug_msg "$m was loaded"
else