fix(mdraid):allow UUID comparison for more than one UUID
(cherry picked from commit b9caf95fd1d520a69b672ff542899a99f9dedf28)
This commit is contained in:
parent
bad03e32cf
commit
feb8957efd
@ -0,0 +1,33 @@
|
|||||||
|
From d364ce8334fef96f48492bd0fb3b7deac37bbb66 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Wenzel <alexander.wenzel@qbeyond.de>
|
||||||
|
Date: Tue, 2 Nov 2021 09:25:56 +0100
|
||||||
|
Subject: [PATCH] fix(mdraid): allow UUID comparison for more than one UUID
|
||||||
|
|
||||||
|
If the system provides more than one UUID, the _MD_UUID var
|
||||||
|
contains a line break after each UUID. Therefore the strstr
|
||||||
|
function could not find any UUID, caused by the additional
|
||||||
|
spaces provided to the function.
|
||||||
|
|
||||||
|
Furthermore this could lead to a boot interruption, because
|
||||||
|
the start of a degraded raid1 won't be executed. So, manual
|
||||||
|
interaction is necessary.
|
||||||
|
---
|
||||||
|
modules.d/90mdraid/mdraid_start.sh | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/modules.d/90mdraid/mdraid_start.sh b/modules.d/90mdraid/mdraid_start.sh
|
||||||
|
index 9ac171d3..7b3d0de7 100755
|
||||||
|
--- a/modules.d/90mdraid/mdraid_start.sh
|
||||||
|
+++ b/modules.d/90mdraid/mdraid_start.sh
|
||||||
|
@@ -54,7 +54,7 @@ _md_force_run() {
|
||||||
|
_UUID=$(str_replace "$_UUID" ":" "")
|
||||||
|
|
||||||
|
# check if we should handle this device
|
||||||
|
- strstr " $_MD_UUID " " $_UUID " || continue
|
||||||
|
+ strstr "$_MD_UUID" "$_UUID" || continue
|
||||||
|
|
||||||
|
_md_start "${_md}"
|
||||||
|
done
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
Name: dracut
|
Name: dracut
|
||||||
Version: 055
|
Version: 055
|
||||||
Release: 9
|
Release: 10
|
||||||
|
|
||||||
Summary: Initramfs generator using udev
|
Summary: Initramfs generator using udev
|
||||||
|
|
||||||
@ -44,6 +44,7 @@ Patch17: backport-fix-dracut-functions.sh-get-block-device-driver-if-i.patch
|
|||||||
Patch18: backport-fix-fs-lib-remove-quoting-form-the-first-argument-of.patch
|
Patch18: backport-fix-fs-lib-remove-quoting-form-the-first-argument-of.patch
|
||||||
Patch19: backport-fix-dracut.sh-exit-if-resolving-executable-dependenc.patch
|
Patch19: backport-fix-dracut.sh-exit-if-resolving-executable-dependenc.patch
|
||||||
Patch20: backport-fix-dracut-install-protect-against-broken-links-poin.patch
|
Patch20: backport-fix-dracut-install-protect-against-broken-links-poin.patch
|
||||||
|
Patch21: backport-fix-mdraid-allow-UUID-comparison-for-more-than-one-U.patch
|
||||||
|
|
||||||
Patch9000: remove-iscsi-related-code-since-it-is-no-longer-main.patch
|
Patch9000: remove-iscsi-related-code-since-it-is-no-longer-main.patch
|
||||||
|
|
||||||
@ -520,6 +521,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 5 2024 hongjinghao <hongjinghao@huawei.com> - 055-10
|
||||||
|
- fix(mdraid):allow UUID comparison for more than one UUID.
|
||||||
|
|
||||||
* Mon Dec 4 2023 huyubiao<huyubiao@huawei.com> - 055-9
|
* Mon Dec 4 2023 huyubiao<huyubiao@huawei.com> - 055-9
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user