|
Harald Hoyer |
b3dfe7 |
From ed9281d6d13b6250e3f12408366fca46bc3384ce Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
b3dfe7 |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
b3dfe7 |
Date: Thu, 26 Oct 2017 09:31:27 +0200
|
|
Harald Hoyer |
b3dfe7 |
Subject: [PATCH] dracut.sh: after doing the lazy resolve always install
|
|
Harald Hoyer |
b3dfe7 |
dependencies
|
|
Harald Hoyer |
b3dfe7 |
|
|
Harald Hoyer |
b3dfe7 |
Exit the lazy resolving mode after doing the lazy resolve, because there
|
|
Harald Hoyer |
b3dfe7 |
won't be any lazy resolving anymore after this step.
|
|
Harald Hoyer |
b3dfe7 |
|
|
Harald Hoyer |
b3dfe7 |
Fixes https://github.com/dracutdevs/dracut/issues/152
|
|
Harald Hoyer |
b3dfe7 |
Obsoletes https://github.com/dracutdevs/dracut/pull/225
|
|
Harald Hoyer |
b3dfe7 |
---
|
|
Harald Hoyer |
b3dfe7 |
dracut.sh | 4 ++++
|
|
Harald Hoyer |
b3dfe7 |
1 file changed, 4 insertions(+)
|
|
Harald Hoyer |
b3dfe7 |
|
|
Harald Hoyer |
b3dfe7 |
diff --git a/dracut.sh b/dracut.sh
|
|
Harald Hoyer |
b3dfe7 |
index 990700af..635fdb1c 100755
|
|
Harald Hoyer |
b3dfe7 |
--- a/dracut.sh
|
|
Harald Hoyer |
b3dfe7 |
+++ b/dracut.sh
|
|
Harald Hoyer |
b3dfe7 |
@@ -1544,6 +1544,10 @@ if [[ $kernel_only != yes ]]; then
|
|
Harald Hoyer |
b3dfe7 |
dinfo "*** Resolving executable dependencies done***"
|
|
Harald Hoyer |
b3dfe7 |
fi
|
|
Harald Hoyer |
b3dfe7 |
|
|
Harald Hoyer |
b3dfe7 |
+ # Now we are done with lazy resolving, always install dependencies
|
|
Harald Hoyer |
b3dfe7 |
+ unset DRACUT_RESOLVE_LAZY
|
|
Harald Hoyer |
b3dfe7 |
+ export DRACUT_RESOLVE_DEPS=1
|
|
Harald Hoyer |
b3dfe7 |
+
|
|
Harald Hoyer |
b3dfe7 |
# libpthread workaround: pthread_cancel wants to dlopen libgcc_s.so
|
|
Harald Hoyer |
b3dfe7 |
for _dir in $libdirs; do
|
|
Harald Hoyer |
b3dfe7 |
for _f in "$_dir/libpthread.so"*; do
|
|
Harald Hoyer |
b3dfe7 |
|