Skip to content

Commit 5b4466e

Browse files
committed
fix(systemd): explicitly install some libs that will not be statically included
Some required libraries that used to be statically included are in the process to be opened via `dlopen()`. References: - systemd/systemd#31131 - systemd/systemd#31550 - systemd/systemd#32019 Closes #2642
1 parent 5d2bda4 commit 5b4466e

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

modules.d/00systemd/module-setup.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,8 @@ EOF
262262
# Install library file(s)
263263
_arch=${DRACUT_ARCH:-$(uname -m)}
264264
inst_libdir_file \
265+
{"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
266+
{"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \
265267
{"tls/$_arch/",tls/,"$_arch/",}"libnss_*"
266268

267269
}

modules.d/01systemd-coredump/module-setup.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ install() {
4040
"$sysusers"/systemd-coredump.conf \
4141
coredumpctl
4242

43+
# Install library file(s)
44+
_arch=${DRACUT_ARCH:-$(uname -m)}
45+
inst_libdir_file \
46+
{"tls/$_arch/",tls/,"$_arch/",}"liblz4.so.*" \
47+
{"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*" \
48+
{"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*"
49+
4350
# Install the hosts local user configurations if enabled.
4451
if [[ $hostonly ]]; then
4552
inst_multiple -H -o \

modules.d/01systemd-journald/module-setup.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,10 @@ install() {
5353
# Install library file(s)
5454
_arch=${DRACUT_ARCH:-$(uname -m)}
5555
inst_libdir_file \
56+
{"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
5657
{"tls/$_arch/",tls/,"$_arch/",}"liblz4.so.*" \
57-
{"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*" \
58-
{"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*"
58+
{"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*" \
59+
{"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*"
5960

6061
# Install the hosts local user configurations if enabled.
6162
if [[ $hostonly ]]; then

0 commit comments

Comments
 (0)