]> git.ipfire.org Git - thirdparty/dracut-ng.git/commitdiff
fix(systemd): explicitly install some libs that will not be statically included
authorAntonio Alvarez Feijoo <antonio.feijoo@suse.com>
Thu, 4 Apr 2024 11:49:26 +0000 (13:49 +0200)
committerNeal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>
Mon, 8 Apr 2024 15:52:05 +0000 (11:52 -0400)
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
modules.d/01systemd-coredump/module-setup.sh
modules.d/01systemd-journald/module-setup.sh

index 66e08ea6993a9eb13a314983b8ef8aaebf3144d4..7234174647a57f238c277fb0db03640e03314218 100755 (executable)
@@ -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_*"
 
 }
index 69ec96686458f4e6095b2b8cd528cad2926c7065..47666b6ca3c9af27d01f549a091e2a13064c4bf5 100755 (executable)
@@ -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 \
index 3cf2a1a119d55a30bf1a367831ea7514a0adcef1..276e752820a9f3f8215d1a9b831cb59f81fb8737 100755 (executable)
@@ -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