|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
From c026ccef5b4b8d2eba98ea38a5c524441bbd3fe6 Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
From: Harald Hoyer <harald@redhat.com>
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
Date: Fri, 20 Jun 2014 11:19:49 +0200
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
Subject: [PATCH] dracut.sh: add libgcc_s, if libpthread is installed
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
workaround the fact, that pthread_cancel() wants to
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
dlopen libgcc_s.so.1
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
---
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
dracut.sh | 9 +++++++++
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
1 file changed, 9 insertions(+)
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
diff --git a/dracut.sh b/dracut.sh
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
index c4163bcfec..04bb3398a3 100755
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
--- a/dracut.sh
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
+++ b/dracut.sh
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
@@ -1348,6 +1348,15 @@ if [[ $kernel_only != yes ]]; then
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
| xargs -r -0 $DRACUT_INSTALL ${initdir:+-D "$initdir"} -R ${DRACUT_FIPS_MODE:+-H} --
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
dinfo "*** Resolving executable dependencies done***"
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
fi
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
+
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
+ # libpthread workaround: pthread_cancel wants to dlopen libgcc_s.so
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
+ for _dir in $libdirs; do
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
+ for _f in "$_dir/libpthread.so"*; do
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
+ [[ -e "$_f" ]] || continue
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
+ inst_libdir_file "libgcc_s.so*"
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
+ break 2
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
+ done
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
+ done
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
fi
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
while pop include_src src && pop include_target tgt; do
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
--
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
1.9.3
|
|
Zbigniew Jędrzejewski-Szmek |
7f4a44 |
|