Skip to content

Commit 5ab18de

Browse files
ryncsnjohannbg
authored andcommitted
fix(squash): apply FIPS and libpthread workaround
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]>
1 parent 07977ee commit 5ab18de

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Diff for: modules.d/99squash/module-setup.sh

+6
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ installpost() {
5252
done
5353
else
5454
DRACUT_RESOLVE_DEPS=1 inst_multiple sh mount modprobe mkdir switch_root grep umount
55+
56+
# libpthread workaround: pthread_cancel wants to dlopen libgcc_s.so
57+
inst_libdir_file -o "libgcc_s.so*"
58+
59+
# FIPS workaround for Fedora/RHEL: libcrypto needs libssl when FIPS is enabled
60+
[[ $DRACUT_FIPS_MODE ]] && inst_libdir_file -o "libssl.so*"
5561
fi
5662

5763
hostonly="" instmods "loop" "squashfs" "overlay"

0 commit comments

Comments
 (0)