kdump-lib: fix sed expression in prepare_cmdline on aarch64

Resolves: RHEL-40745

commit f3669ac67a8c4a05ba7a9c9b62ae8756e50a186b
Author: Philipp Rudo <prudo@redhat.com>
Date:   Tue Jun 18 14:57:16 2024 +0200

    kdump-lib: fix sed expression in prepare_cmdline on aarch64

    The sed expression misses a 's' for search and replace...

    Fixes: 0f6ad91 ("kdump-lib: fix prepare_cmdline")
    Signed-off-by: Philipp Rudo <prudo@redhat.com>

Signed-off-by: Philipp Rudo <prudo@redhat.com>
This commit is contained in:
Philipp Rudo 2024-07-09 15:20:24 +02:00
parent 021f5a146e
commit ee3b7a45dd
2 changed files with 32 additions and 0 deletions

View File

@ -0,0 +1,30 @@
From d25d3d4500d1ca1357350fa4a28ac89a33f250e0 Mon Sep 17 00:00:00 2001
From: Philipp Rudo <prudo@redhat.com>
Date: Tue, 18 Jun 2024 14:57:16 +0200
Subject: [PATCH 2/7] kdump-lib: fix sed expression in prepare_cmdline on
aarch64
The sed expression misses a 's' for search and replace...
Fixes: 0f6ad91 ("kdump-lib: fix prepare_cmdline")
Signed-off-by: Philipp Rudo <prudo@redhat.com>
---
kdump-lib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kdump-lib.sh b/kdump-lib.sh
index 79714f9..35f0ac9 100755
--- a/kdump-lib.sh
+++ b/kdump-lib.sh
@@ -802,7 +802,7 @@ prepare_cmdline()
# This is a workaround on AWS platform. Always remove irqpoll since it
# may cause the hot-remove of some pci hotplug device.
- is_aws_aarch64 && out=$(echo "$out" | sed -e "/\<irqpoll\>//")
+ is_aws_aarch64 && out=$(echo "$out" | sed -e "s/\<irqpoll\>//")
# Always disable gpt-auto-generator as it hangs during boot of the
# crash kernel. Furthermore we know which disk will be used for dumping
--
2.45.2

View File

@ -66,6 +66,7 @@ Patch610: kexec-tools-2.0.28-makedumpfile-0002-PATCH-Fix-failure-of-hugetlb-page
Patch611: kexec-tools-2.0.28-makedumpfile-0003-PATCH-Fix-wrong-exclusion-of-Slab-pages-on-Linux-6.1.patch Patch611: kexec-tools-2.0.28-makedumpfile-0003-PATCH-Fix-wrong-exclusion-of-Slab-pages-on-Linux-6.1.patch
Patch612: 0001-Use-grep-q-cmd-instead-of-cmd-grep-q.patch Patch612: 0001-Use-grep-q-cmd-instead-of-cmd-grep-q.patch
Patch613: 0001-kdumpctl-Drop-default-kexec-d-option.patch Patch613: 0001-kdumpctl-Drop-default-kexec-d-option.patch
Patch614: 0002-kdump-lib-fix-sed-expression-in-prepare_cmdline-on-a.patch
%description %description
kexec-tools provides /sbin/kexec binary that facilitates a new kexec-tools provides /sbin/kexec binary that facilitates a new
@ -162,6 +163,7 @@ tar -z -x -v -f %{SOURCE19}
%patch 611 -p1 %patch 611 -p1
%patch 612 -p1 -d kdump-utils-%{kdump_utils_ver} %patch 612 -p1 -d kdump-utils-%{kdump_utils_ver}
%patch 613 -p1 -d kdump-utils-%{kdump_utils_ver} %patch 613 -p1 -d kdump-utils-%{kdump_utils_ver}
%patch 614 -p1 -d kdump-utils-%{kdump_utils_ver}
%ifarch ppc %ifarch ppc
%define archdef ARCH=ppc %define archdef ARCH=ppc