Skip to content

Commit

Permalink
fix(squash): apply FIPS and libpthread workaround
Browse files Browse the repository at this point in the history
There are some workarounds in dracut.sh for FIPS/libpthread covering
some hidden lib dependency issues. These workarounds didn't take effect
for the squash loader since the squash loader is installed
independently. So apply these workarounds again.

Also skip the lib detection code, since these extra installed libs
are small, and squash loader contents are dropped after switch root,
won't be an issue to be always installed. And this makes the code
cleaner.

Signed-off-by: Kairui Song <[email protected]>
  • Loading branch information
ryncsn authored and johannbg committed Aug 9, 2021
1 parent 07977ee commit 5ab18de
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions modules.d/99squash/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ installpost() {
done
else
DRACUT_RESOLVE_DEPS=1 inst_multiple sh mount modprobe mkdir switch_root grep umount

# libpthread workaround: pthread_cancel wants to dlopen libgcc_s.so
inst_libdir_file -o "libgcc_s.so*"

# FIPS workaround for Fedora/RHEL: libcrypto needs libssl when FIPS is enabled
[[ $DRACUT_FIPS_MODE ]] && inst_libdir_file -o "libssl.so*"
fi

hostonly="" instmods "loop" "squashfs" "overlay"
Expand Down

0 comments on commit 5ab18de

Please sign in to comment.