[PATCH] kdump-lib: Add the CoreOS kernel dir to the boot_dirlist

[Lichen Liu]

The kernel of CoreOS is not in the standard locations, add
/boot/ostree/* to the boot_dirlist to find the vmlinuz.

Signed-off-by: Lichen Liu 
---
 kdump-lib.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/kdump-lib.sh b/kdump-lib.sh
index 36437ab..3e8d8a5 100755
--- a/kdump-lib.sh
+++ b/kdump-lib.sh
@@ -644,6 +644,14 @@ prepare_kdump_kernel()
    boot_dirlist=${KDUMP_BOOTDIR:-"/boot /boot/efi /efi /"}
    boot_imglist="$KDUMP_IMG-$kdump_kernelver$KDUMP_IMG_EXT $machine_id/$kdump_kernelver/$KDUMP_IMG"

+	# The kernel of CoreOS is not in the standard locations.
+	if is_atomic; then
+		local coreos_boot_dir
+		for coreos_boot_dir in /boot/ostree/*; do
+			boot_dirlist="$coreos_boot_dir $boot_dirlist"
+		done
+	fi
+
    # Use BOOT_IMAGE as reference if possible, strip the GRUB root device prefix in (hd0,gpt1) format
    boot_img="$(sed "s/^BOOT_IMAGE=((\S*))?(\S*) .*/\2/" /proc/cmdline)"
    if [[ "$boot_img" == *"$kdump_kernelver" ]]; then

[Tao Liu]

Hi Lichen,

On Tue, Jun 21, 2022 at 6:00 PM Lichen Liu  wrote:
> The kernel of CoreOS is not in the standard locations, add
> /boot/ostree/* to the boot_dirlist to find the vmlinuz.
> Signed-off-by: Lichen Liu
>
> kdump-lib.sh | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/kdump-lib.sh b/kdump-lib.sh
> index 36437ab..3e8d8a5 100755
> --- a/kdump-lib.sh
> +++ b/kdump-lib.sh
> @@ -644,6 +644,14 @@ prepare_kdump_kernel()
>         boot_dirlist=${KDUMP_BOOTDIR:-"/boot /boot/efi /efi /"}
>         boot_imglist="$KDUMP_IMG-$kdump_kernelver$KDUMP_IMG_EXT $machine_id/$kdump_kernelver/$KDUMP_IMG"
>   # The kernel of CoreOS is not in the standard locations.
>   if is_atomic; then
>           local coreos_boot_dir
>           for coreos_boot_dir in /boot/ostree/*; do
>                   boot_dirlist="$coreos_boot_dir $boot_dirlist"
>           done
>   fi

How about replacing the for loop to something like:
      boot_dirlist="$(echo /boot/ostree/*) $boot_dirlist"

Thanks,
Tao Liu
>     # Use BOOT_IMAGE as reference if possible, strip the GRUB root device prefix in (hd0,gpt1) format
>     boot_img="$(sed "s/^BOOT_IMAGE=\((\S*)\)\?\(\S*\) .*/\2/" /proc/cmdline)"
>     if [[ "$boot_img" == *"$kdump_kernelver" ]]; then
>
> --
> 2.31.1
> _______________________________________________
> kexec mailing list -- [e-mail]
> To unsubscribe send an email to [e-mail]
> Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives: https://lists.fedoraproject.org/archives/list/[e-mail]
> Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure

[Coiby Xu]

Hi Dusty,

If possible, could you help review this patch?

Thanks!

On Tue, Jun 21, 2022 at 05:58:55PM +0800, Lichen Liu wrote:
> The kernel of CoreOS is not in the standard locations, add
> /boot/ostree/* to the boot_dirlist to find the vmlinuz.
> Signed-off-by: Lichen Liu
>
> kdump-lib.sh | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/kdump-lib.sh b/kdump-lib.sh
> index 36437ab..3e8d8a5 100755
> --- a/kdump-lib.sh
> +++ b/kdump-lib.sh
> @@ -644,6 +644,14 @@ prepare_kdump_kernel()
>    boot_dirlist=${KDUMP_BOOTDIR:-"/boot /boot/efi /efi /"}
>    boot_imglist="$KDUMP_IMG-$kdump_kernelver$KDUMP_IMG_EXT $machine_id/$kdump_kernelver/$KDUMP_IMG"
> # The kernel of CoreOS is not in the standard locations.
> if is_atomic; then
> local coreos_boot_dir
> for coreos_boot_dir in /boot/ostree/*; do
> 	boot_dirlist="$coreos_boot_dir $boot_dirlist"
> done
> fi
> # Use BOOT_IMAGE as reference if possible, strip the GRUB root device prefix in (hd0,gpt1) format
>  boot_img="$(sed "s/^BOOT_IMAGE=((\S*))?(\S*) .*/\2/" /proc/cmdline)"
>  if [[ "$boot_img" == *"$kdump_kernelver" ]]; then
>
> -- 
> 2.31.1
> _______________________________________________
> kexec mailing list -- [e-mail]
> To unsubscribe send an email to [e-mail]
> Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives: https://lists.fedoraproject.org/archives/list/[e-mail]
> Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure

[Dusty Mabe]

On 6/21/22 21:42, Coiby Xu wrote:
> Hi Dusty,
>
> If possible, could you help review this patch?

Hi Coiby,

Ran a test. It seems to work but I thought it important to add
a few fixes on top. See what you think about:

https://src.fedoraproject.org/rpms/kexec-tools/pull-request/12

[Coiby Xu]

On Wed, Jun 22, 2022 at 01:22:42PM -0400, Dusty Mabe wrote:
> On 6/21/22 21:42, Coiby Xu wrote:
> > Hi Dusty,
> >
> > If possible, could you help review this patch?
>
> Hi Coiby,
>
> Ran a test. It seems to work but I thought it important to add
> a few fixes on top. See what you think about:
>
> https://src.fedoraproject.org/rpms/kexec-tools/pull-request/12

Thanks! Lichen has created a merge request in the our testing gitlab
repo combining your commits and Tao's suggestion
https://gitlab.com/coxu/fedora-kexec-tools/-/merge_requests/14
since it's better for code review there. And I'll appreciate it if you
have any feedback on gitlab-based workflow.
>

[Dusty Mabe]

On 6/24/22 06:24, Coiby Xu wrote:
> On Wed, Jun 22, 2022 at 01:22:42PM -0400, Dusty Mabe wrote:
> > On 6/21/22 21:42, Coiby Xu wrote:
> > > Hi Dusty,
> > >
> > > If possible, could you help review this patch?

Hey - I see you have some comments on the code I added. I updated my PR
based on the feedback you gave.

https://src.fedoraproject.org/rpms/kexec-tools/pull-request/12

I also notice an error in the logic:

https://src.fedoraproject.org/rpms/kexec-tools/blob/rawhide/f/kdumpctl#_1477

We do have ppc64le RHCOS (already) and will have ppc64le Fedora CoreOS in the future.

Is there any chance this is the reason why we're having so much trouble with ppc64le kdump
today? https://bugzilla.redhat.com/show_bug.cgi?id=2082712

Dusty