|
 |
6edea0 |
From 818746166fec7c1e572ef12618edadc0535d4663 Mon Sep 17 00:00:00 2001
|
|
|
6edea0 |
From: Kairui Song <kasong@redhat.com>
|
|
|
6edea0 |
Date: Tue, 9 Jun 2020 03:03:18 +0800
|
|
|
6edea0 |
Subject: [PATCH] dracut.sh: Move the library workaround after squash
|
|
|
6edea0 |
|
|
|
6edea0 |
Ensure the workaround is also valid when dracut-squash module is used
|
|
|
6edea0 |
|
|
|
6edea0 |
Signed-off-by: Kairui Song <kasong@redhat.com>
|
|
|
6edea0 |
(cherry picked from commit de3cb0e3214c3fbab3a94e705445b4d1c2bf0dff)
|
|
|
6edea0 |
|
|
|
6edea0 |
Cherry-picked from: de3cb0e3214c3fbab3a94e705445b4d1c2bf0dff
|
|
|
6edea0 |
Resolves: #1841077
|
|
|
6edea0 |
---
|
|
|
6edea0 |
dracut.sh | 20 +++++++++++---------
|
|
|
6edea0 |
1 file changed, 11 insertions(+), 9 deletions(-)
|
|
|
6edea0 |
|
|
|
6edea0 |
diff --git a/dracut.sh b/dracut.sh
|
|
|
6edea0 |
index 487add57..4c5176a1 100755
|
|
|
6edea0 |
--- a/dracut.sh
|
|
|
6edea0 |
+++ b/dracut.sh
|
|
|
6edea0 |
@@ -1578,15 +1578,6 @@ if [[ $kernel_only != yes ]]; then
|
|
|
6edea0 |
# Now we are done with lazy resolving, always install dependencies
|
|
|
6edea0 |
unset DRACUT_RESOLVE_LAZY
|
|
|
6edea0 |
export DRACUT_RESOLVE_DEPS=1
|
|
|
6edea0 |
-
|
|
|
6edea0 |
- # libpthread workaround: pthread_cancel wants to dlopen libgcc_s.so
|
|
|
6edea0 |
- for _dir in $libdirs; do
|
|
|
6edea0 |
- for _f in "$_dir/libpthread.so"*; do
|
|
|
6edea0 |
- [[ -e "$_f" ]] || continue
|
|
|
6edea0 |
- inst_libdir_file "libgcc_s.so*"
|
|
|
6edea0 |
- break 2
|
|
|
6edea0 |
- done
|
|
|
6edea0 |
- done
|
|
|
6edea0 |
fi
|
|
|
6edea0 |
|
|
|
6edea0 |
for ((i=0; i < ${#include_src[@]}; i++)); do
|
|
|
6edea0 |
@@ -1840,6 +1831,17 @@ if dracut_module_included "squash"; then
|
|
|
6edea0 |
done
|
|
|
6edea0 |
fi
|
|
|
6edea0 |
|
|
|
6edea0 |
+if [[ $kernel_only != yes ]]; then
|
|
|
6edea0 |
+ # libpthread workaround: pthread_cancel wants to dlopen libgcc_s.so
|
|
|
6edea0 |
+ for _dir in $libdirs; do
|
|
|
6edea0 |
+ for _f in "$dracutsysrootdir$_dir/libpthread.so"*; do
|
|
|
6edea0 |
+ [[ -e "$_f" ]] || continue
|
|
|
6edea0 |
+ inst_libdir_file "libgcc_s.so*"
|
|
|
6edea0 |
+ break 2
|
|
|
6edea0 |
+ done
|
|
|
6edea0 |
+ done
|
|
|
6edea0 |
+fi
|
|
|
6edea0 |
+
|
|
|
6edea0 |
if [[ $do_strip = yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then
|
|
|
6edea0 |
dinfo "*** Stripping files ***"
|
|
|
6edea0 |
find "$initdir" -type f \
|
|
|
6edea0 |
|