|
 |
ab92d3 |
From c6d8832f86bc2ef7fbab6f703479816dd6078902 Mon Sep 17 00:00:00 2001
|
|
|
ab92d3 |
From: Pingfan Liu <piliu@redhat.com>
|
|
|
ab92d3 |
Date: Fri, 9 Jul 2021 11:55:16 +0800
|
|
|
ab92d3 |
Subject: [PATCH] fix(squash): keep ld cache under initdir
|
|
|
ab92d3 |
|
|
|
ab92d3 |
When running kdump on PowerPC, the following bug is hit:
|
|
|
ab92d3 |
[ 0.391629] Freeing unused kernel memory: 5568K
|
|
|
ab92d3 |
[ 0.391634] This architecture does not have kernel memory protection.
|
|
|
ab92d3 |
/bin/sh: error while loading shared libraries: libc.so.6: cannot open shared object file: No such file or directory
|
|
|
ab92d3 |
[ 0.392214] Kernel panic - not syncing: Attempted to kill init! exitcode=0x00007f00
|
|
|
ab92d3 |
[ 0.392214]
|
|
|
ab92d3 |
[ 0.392223] CPU: 6 PID: 1 Comm: init Not tainted 4.18.0-319.el8.ppc64le #1
|
|
|
ab92d3 |
[ 0.392228] Call Trace:
|
|
|
ab92d3 |
[ 0.392234] [c00000000c703c10] [c000000008ecb94c] dump_stack+0xb0/0xf4 (unreliable)
|
|
|
ab92d3 |
[ 0.392243] [c00000000c703c50] [c000000008167324] panic+0x148/0x3c4
|
|
|
ab92d3 |
[ 0.392249] [c00000000c703cf0] [c000000008170474] do_exit+0xcd4/0xd40
|
|
|
ab92d3 |
[ 0.392255] [c00000000c703dc0] [c0000000081705b0] do_group_exit+0x60/0x110
|
|
|
ab92d3 |
[ 0.392261] [c00000000c703e00] [c000000008170684] sys_exit_group+0x24/0x30
|
|
|
ab92d3 |
[ 0.392268] [c00000000c703e20] [c00000000800b408] system_call+0x5c/0x70
|
|
|
ab92d3 |
|
|
|
ab92d3 |
This is due to the non-conventional library path:
|
|
|
ab92d3 |
ldd /bin/bash
|
|
|
ab92d3 |
linux-vdso64.so.1 (0x00007fffbdc90000)
|
|
|
ab92d3 |
libtinfo.so.6 => /lib64/libtinfo.so.6 (0x00007fffbda80000)
|
|
|
ab92d3 |
libdl.so.2 => /lib64/libdl.so.2 (0x00007fffbda50000)
|
|
|
ab92d3 |
libc.so.6 => /lib64/glibc-hwcaps/power9/libc-2.28.so (0x00007fffbd830000)
|
|
|
ab92d3 |
^^^
|
|
|
ab92d3 |
/lib64/ld64.so.2 (0x00007fffbdcb0000)
|
|
|
ab92d3 |
|
|
|
ab92d3 |
ldd finds the path by libc.so.6 -> /usr/lib64/libc.so.6 ->
|
|
|
ab92d3 |
/usr/lib64/glibc-hwcaps/power9/libc-2.28.so and cache the result. So
|
|
|
ab92d3 |
when dracut_install, it only saw
|
|
|
ab92d3 |
'/usr/lib64/glibc-hwcaps/power9/libc-2.28.so' and blind to
|
|
|
ab92d3 |
'/usr/lib64/libc.so.6'
|
|
|
ab92d3 |
|
|
|
ab92d3 |
In the final kdumpimg, the symlink /usr/lib64/libc.so.6 is not created,
|
|
|
ab92d3 |
hence ld.so can not find the /usr/lib64/glibc-hwcaps/power9/libc-2.28.so
|
|
|
ab92d3 |
|
|
|
ab92d3 |
On the other hand, during the process of building kdumpimg, all of dynamic library info
|
|
|
ab92d3 |
have been cached in ld.so.cache. Hence this bug can be simplely resolved
|
|
|
ab92d3 |
by keeping ld cache under $initdir/etc.
|
|
|
ab92d3 |
|
|
|
ab92d3 |
Signed-off-by: Pingfan Liu <piliu@redhat.com>
|
|
|
ab92d3 |
---
|
|
|
ab92d3 |
v3 -> v4:
|
|
|
ab92d3 |
use inst() instead of copy
|
|
|
ab92d3 |
v2 -> v3:
|
|
|
ab92d3 |
fix format by shfmt -s -w modules.d/99squash/module-setup.sh
|
|
|
ab92d3 |
v1 -> v2:
|
|
|
ab92d3 |
cp -r /etc/ld.so* instead of move, since after switch-root, initdir
|
|
|
ab92d3 |
can not be seen any longer
|
|
|
ab92d3 |
|
|
|
ab92d3 |
(cherry picked from commit dc21638c3f0acbb54417f3bfb6294ad5514bf2db)
|
|
|
ab92d3 |
|
|
|
ab92d3 |
Resolves: #1959336
|
|
|
ab92d3 |
---
|
|
|
ab92d3 |
modules.d/99squash/module-setup.sh | 5 +++++
|
|
|
ab92d3 |
1 file changed, 5 insertions(+)
|
|
|
ab92d3 |
|
|
|
ab92d3 |
diff --git a/modules.d/99squash/module-setup.sh b/modules.d/99squash/module-setup.sh
|
|
|
ab92d3 |
index 8c9982c0..14790ce8 100644
|
|
|
ab92d3 |
--- a/modules.d/99squash/module-setup.sh
|
|
|
ab92d3 |
+++ b/modules.d/99squash/module-setup.sh
|
|
|
ab92d3 |
@@ -28,6 +28,11 @@ installpost() {
|
|
|
ab92d3 |
[[ "$squash_dir" == "$i"/* ]] || mv "$i" "$squash_dir"/
|
|
|
ab92d3 |
done
|
|
|
ab92d3 |
|
|
|
ab92d3 |
+ # initdir also needs ld.so.* to make ld.so work
|
|
|
ab92d3 |
+ inst /etc/ld.so.cache
|
|
|
ab92d3 |
+ inst /etc/ld.so.conf
|
|
|
ab92d3 |
+ inst_dir /etc/ld.so.conf.d/
|
|
|
ab92d3 |
+
|
|
|
ab92d3 |
# Create mount points for squash loader
|
|
|
ab92d3 |
mkdir -p "$initdir"/squash/
|
|
|
ab92d3 |
mkdir -p "$squash_dir"/squash/
|
|
|
ab92d3 |
|