kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dracut.sh: Move the library workaround after squash 

Ensure the workaround is also valid when dracut-squash module is used

Signed-off-by: Kairui Song <kasong@redhat.com>
master
Kairui Song 2020-06-09 03:03:18 +08:00 committed by Harald Hoyer
parent 6dafdda4a6
commit de3cb0e321
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dracut.sh
View File

@ -1661,15 +1661,6 @@ if [[ $kernel_only != yes ]]; then
# Now we are done with lazy resolving, always install dependencies # Now we are done with lazy resolving, always install dependencies
unset DRACUT_RESOLVE_LAZY unset DRACUT_RESOLVE_LAZY
export DRACUT_RESOLVE_DEPS=1 export DRACUT_RESOLVE_DEPS=1

# libpthread workaround: pthread_cancel wants to dlopen libgcc_s.so
for _dir in $libdirs; do
for _f in "$dracutsysrootdir$_dir/libpthread.so"*; do
[[ -e "$_f" ]] || continue
inst_libdir_file "libgcc_s.so*"
break 2
done
done
fi fi


for ((i=0; i < ${#include_src[@]}; i++)); do for ((i=0; i < ${#include_src[@]}; i++)); do
@ -1941,6 +1932,17 @@ if dracut_module_included "squash"; then
done done
fi fi


if [[ $kernel_only != yes ]]; then
# libpthread workaround: pthread_cancel wants to dlopen libgcc_s.so
for _dir in $libdirs; do
for _f in "$dracutsysrootdir$_dir/libpthread.so"*; do
[[ -e "$_f" ]] || continue
inst_libdir_file "libgcc_s.so*"
break 2
done
done
fi

if [[ $do_strip = yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then if [[ $do_strip = yes ]] && ! [[ $DRACUT_FIPS_MODE ]]; then
dinfo "*** Stripping files ***" dinfo "*** Stripping files ***"
find "$initdir" -type f \ find "$initdir" -type f \