From ef81bb9f448c4982e0278c71b1010e278b44427e Mon Sep 17 00:00:00 2001
From: Coiby Xu <coxu@redhat.com>
Date: Tue, 21 Feb 2023 12:02:26 +0800
Subject: [PATCH] Use the correct command to get architecture

Related: bz2060319
Upstream: Fedora
Conflict: None

commit 12e6cd2b76a10bb6b52c0cc28ad0e8c8f57a319a
Author: Coiby Xu <coxu@redhat.com>
Date:   Mon Feb 20 17:33:08 2023 +0800

    Use the correct command to get architecture

    `uname -r` was used by mistake. As a result, kexec-tools failed to
    update crashkernel=auto during in-place upgrade from RHEL8 to RHEL9.

    `uname -m` should be used to get architecture instead.

    Fixes: 5951b5e2 ("Don't try to update crashkernel when bootloader is not installed")

    Signed-off-by: Coiby Xu <coxu@redhat.com>
    Reviewed-by: Lichen Liu <lichliu@redhat.com>

Signed-off-by: Coiby Xu <coxu@redhat.com>
---
 kdumpctl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kdumpctl b/kdumpctl
index 7f51b2e..1005e6d 100755
--- a/kdumpctl
+++ b/kdumpctl
@@ -1640,7 +1640,7 @@ reset_crashkernel()
 
 _is_bootloader_installed()
 {
-	if [[ $(uname -r) == s390x ]]; then
+	if [[ $(uname -m) == s390x ]]; then
 		test -f /etc/zipl.conf
 	else
 		test -f /boot/grub2/grub.cfg