backport patches from upstream

This commit is contained in:
wangyuhang 2023-12-07 19:32:00 +08:00
parent 072f2b3507
commit 6a92ba92da
2 changed files with 42 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From 4916dfc2b94dca0e84eb7dc58a9266d02c416b4a Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 1 Oct 2020 14:08:38 +0200
Subject: [PATCH] dracut-install: ignore bogus preload libs
If there are any nonexistent libraries listed in /etc/ld.so.preload, ldd
prints error messages like:
ERROR: ld.so: object '/usr/lib64/libfoo.so.1' from /etc/ld.so.preload cannot be preloaded (cannot open shared object file): ignored.
This causes resolve_deps() to return error, which leads to symlinks
(like usr/bin/awk) not being copied into the initrd.
Conflict:NA
Reference:https://github.com/dracutdevs/dracut/commit/4916dfc2b94dca0e84eb7dc58a9266d02c416b4a
---
install/dracut-install.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/install/dracut-install.c b/install/dracut-install.c
index 9fbd72cd..ea0668b8 100644
--- a/install/dracut-install.c
+++ b/install/dracut-install.c
@@ -569,6 +569,9 @@ static int resolve_deps(const char *src)
if (strstr(buf, "cannot read header"))
break;
+ if (strstr(buf, "cannot be preloaded"))
+ break;
+
if (strstr(buf, destrootdir))
break;
--
2.23.0

View File

@ -9,7 +9,7 @@
Name: dracut
Version: 050
Release: 5
Release: 6
Summary: Initramfs generator using udev
@ -40,6 +40,7 @@ Patch0012: Fix-test-in-lsinitrd.patch
Patch0013: add-option-to-include-file-metadata-in-initramfs.patch
Patch0014: backport-fix-always-use-mkdir-p.patch
Patch0015: backport-fix-dracut.sh-omission-is-an-addition-to-other-omiss.patch
Patch0016: backport-dracut-install-ignore-bogus-preload-libs.patch
Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
Source2: openEuler.conf.example
@ -490,6 +491,10 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
%endif
%changelog
* Thu Dec 7 2023 wangyuhang <wangyuhang27@huawei.com> - 050-6
- [add] backport patches from upstream
backport-dracut-install-ignore-bogus-preload-libs.patch
* Wed May 26 2021 panxiaohe <panxiaohe@huawei.com> - 050-5
- [add] backport patches from upstream
backport-fix-always-use-mkdir-p.patch