From b73de624600c969fe28e0ad12bbaf6d79f4538d2 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 28 Jun 2022 22:12:52 +0000
Subject: [PATCH] import kexec-tools-2.0.24-4.el8

---
 SOURCES/kdump-lib.sh   | 5 ++++-
 SPECS/kexec-tools.spec | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/SOURCES/kdump-lib.sh b/SOURCES/kdump-lib.sh
index bfff546..342a45a 100755
--- a/SOURCES/kdump-lib.sh
+++ b/SOURCES/kdump-lib.sh
@@ -930,9 +930,12 @@ kdump_get_arch_recommend_size()
 # $1: the block device to be checked in maj:min format
 get_luks_crypt_dev()
 {
+    local _type
+
     [[ -b /dev/block/$1 ]] || return 1
 
-    local _type=$(eval "$(blkid -u filesystem,crypto -o export -- /dev/block/$1); echo \$TYPE")
+    _type=$(blkid -u filesystem,crypto -o export -- "/dev/block/$1" | \
+            sed -n -E "s/^TYPE=(.*)$/\1/p")
     [[ $_type == "crypto_LUKS" ]] && echo $1
 
     for _x in /sys/dev/block/$1/slaves/*; do
diff --git a/SPECS/kexec-tools.spec b/SPECS/kexec-tools.spec
index bdc4b67..9275a80 100644
--- a/SPECS/kexec-tools.spec
+++ b/SPECS/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.24
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component
@@ -393,6 +393,9 @@ done
 %endif
 
 %changelog
+* Tue Jun 21 2022 Pingfan Liu <piliu@redhat.com> - 2.0.24-4
+- kdump-lib.sh: Check the output of blkid with sed instead of eval
+
 * Fri Jun 10 2022 Pingfan Liu <piliu@redhat.com> - 2.0.24-3
 - kdump.sysconfig*: add ignition.firstboot to KDUMP_COMMANDLINE_REMOVE