Fix kdump-tools to not overwrite MODULES conf to dep (#17490)

- Why I did it
Fix kdump-tools to not overwrite MODULES conf to dep. Problem is seen if the build is failed and the build is retriggered immediately as part of retry mechanism
This command is failing during the second run

+ for kernel_release in $(ls $FILESYSTEM_ROOT/lib/modules/)
+ sudo LANG=C chroot ./fsroot-mellanox /etc/kernel/postinst.d/kdump-tools 6.1.0-11-2-amd64
+ clean_sys
https://github.com/sonic-net/sonic-buildimage/blob/master/files/build_templates/sonic_debian_extension.j2#L311

Community Issue: https://www.mail-archive.com/kernel-packages@lists.launchpad.net/msg515013.html

- How I did it
Add a patch to revert the override

- How to verify it
vkarri@482a053c44f4:/sonic$ sudo unsquashfs -d ./fsroot-mellanox target/sonic-mellanox.bin__mellanox__rfs.squashfs

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
This commit is contained in:
Vivek 2023-12-25 01:13:19 -08:00 committed by GitHub
parent c0bc1d9753
commit 18dd948e60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,35 @@
From 9f15d2abc8c39bc6eae6ffaccbb3a5d9d4fa84b8 Mon Sep 17 00:00:00 2001
From: Vivek Reddy <vkarri@nvidia.com>
Date: Tue, 12 Dec 2023 11:15:54 +0200
Subject: [PATCH] Revert the MODULES=dep optimization to reduce the size of initramfs
kdump-tools command is failing in chroot because of this optimization
Overriding the MODULES to dep is causing mkinitramfs to search for the
block device where the / is mounted
Ref: https://www.mail-archive.com/kernel-packages@lists.launchpad.net/msg515013.html
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
---
debian/kernel-postinst-generate-initrd | 6 ------
1 file changed, 6 deletions(-)
diff --git a/debian/kernel-postinst-generate-initrd b/debian/kernel-postinst-generate-initrd
index 1140c40..96a0f15 100755
--- a/debian/kernel-postinst-generate-initrd
+++ b/debian/kernel-postinst-generate-initrd
@@ -40,12 +40,6 @@ for conf_file in /etc/initramfs-tools/conf.d/*; do
fi
done
-if test "${MODULES-most}" = most; then
- # Switch from "most" to "dep" to reduce the size of the initramfs.
- # "netboot" and "list" are expected to be already small enough.
- KDUMP_MODULES=dep
-fi
-
# We need a modified copy of initramfs-tools directory
# with MODULES=dep in initramfs.conf
if [ ! -d "$kdumpdir" ];then
--
2.41.0

View File

@ -1 +1,2 @@
0002-core-file-prefixed-by-kdump.patch
0003-Revert-the-MODULES-dep-optimization.patch