73 lines
2.7 KiB
Diff
73 lines
2.7 KiB
Diff
|
From bad2bc80cdcfac8915374497cc47ce9d5670d015 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
|
||
|
|
Date: Thu, 4 Apr 2024 13:49:26 +0200
|
||
|
|
Subject: [PATCH 20/23] 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:
|
||
|
|
- https://github.com/systemd/systemd/pull/31131
|
||
|
|
- https://github.com/systemd/systemd/pull/31550
|
||
|
|
- https://github.com/systemd/systemd/pull/32019
|
||
|
|
|
||
|
|
Closes #2642
|
||
|
|
---
|
||
|
|
modules.d/00systemd/module-setup.sh | 2 ++
|
||
|
|
modules.d/01systemd-coredump/module-setup.sh | 7 +++++++
|
||
|
|
modules.d/01systemd-journald/module-setup.sh | 5 +++--
|
||
|
|
3 files changed, 12 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
|
||
|
|
index 66e08ea6..72341746 100755
|
||
|
|
--- a/modules.d/00systemd/module-setup.sh
|
||
|
|
+++ b/modules.d/00systemd/module-setup.sh
|
||
|
|
@@ -260,6 +260,8 @@ EOF
|
||
|
|
# Install library file(s)
|
||
|
|
_arch=${DRACUT_ARCH:-$(uname -m)}
|
||
|
|
inst_libdir_file \
|
||
|
|
+ {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
|
||
|
|
+ {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \
|
||
|
|
{"tls/$_arch/",tls/,"$_arch/",}"libnss_*"
|
||
|
|
|
||
|
|
}
|
||
|
|
diff --git a/modules.d/01systemd-coredump/module-setup.sh b/modules.d/01systemd-coredump/module-setup.sh
|
||
|
|
index 69ec9668..47666b6c 100755
|
||
|
|
--- a/modules.d/01systemd-coredump/module-setup.sh
|
||
|
|
+++ b/modules.d/01systemd-coredump/module-setup.sh
|
||
|
|
@@ -40,6 +40,13 @@ install() {
|
||
|
|
"$sysusers"/systemd-coredump.conf \
|
||
|
|
coredumpctl
|
||
|
|
|
||
|
|
+ # Install library file(s)
|
||
|
|
+ _arch=${DRACUT_ARCH:-$(uname -m)}
|
||
|
|
+ inst_libdir_file \
|
||
|
|
+ {"tls/$_arch/",tls/,"$_arch/",}"liblz4.so.*" \
|
||
|
|
+ {"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*" \
|
||
|
|
+ {"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*"
|
||
|
|
+
|
||
|
|
# Install the hosts local user configurations if enabled.
|
||
|
|
if [[ $hostonly ]]; then
|
||
|
|
inst_multiple -H -o \
|
||
|
|
diff --git a/modules.d/01systemd-journald/module-setup.sh b/modules.d/01systemd-journald/module-setup.sh
|
||
|
|
index 3cf2a1a1..276e7528 100755
|
||
|
|
--- a/modules.d/01systemd-journald/module-setup.sh
|
||
|
|
+++ b/modules.d/01systemd-journald/module-setup.sh
|
||
|
|
@@ -53,9 +53,10 @@ install() {
|
||
|
|
# Install library file(s)
|
||
|
|
_arch=${DRACUT_ARCH:-$(uname -m)}
|
||
|
|
inst_libdir_file \
|
||
|
|
+ {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
|
||
|
|
{"tls/$_arch/",tls/,"$_arch/",}"liblz4.so.*" \
|
||
|
|
- {"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*" \
|
||
|
|
- {"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*"
|
||
|
|
+ {"tls/$_arch/",tls/,"$_arch/",}"liblzma.so.*" \
|
||
|
|
+ {"tls/$_arch/",tls/,"$_arch/",}"libzstd.so.*"
|
||
|
|
|
||
|
|
# Install the hosts local user configurations if enabled.
|
||
|
|
if [[ $hostonly ]]; then
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|