From 6bb61dc97c39b264bab5d2680686512e8b3e85cd Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 15 2020 15:59:59 +0000
Subject: import kexec-tools-2.0.20-34.el8_3.1


---

diff --git a/SOURCES/kdump-lib.sh b/SOURCES/kdump-lib.sh
index 3abd707..9f70bdd 100755
--- a/SOURCES/kdump-lib.sh
+++ b/SOURCES/kdump-lib.sh
@@ -617,6 +617,7 @@ is_secure_boot_enforced()
 		return 0
     fi
 
+    # Detect secure boot on x86 and arm64
     secure_boot_file=$(find /sys/firmware/efi/efivars -name SecureBoot-* 2>/dev/null)
     setup_mode_file=$(find /sys/firmware/efi/efivars -name SetupMode-* 2>/dev/null)
 
@@ -629,6 +630,11 @@ is_secure_boot_enforced()
         fi
     fi
 
+    # Detect secure boot on s390x
+    if [[ -e "/sys/firmware/ipl/secure" && "$(cat /sys/firmware/ipl/secure)" == "1" ]]; then
+        return 0
+    fi
+
     return 1
 }
 
diff --git a/SPECS/kexec-tools.spec b/SPECS/kexec-tools.spec
index c04f1fc..5f9254c 100644
--- a/SPECS/kexec-tools.spec
+++ b/SPECS/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.20
-Release: 34%{?dist}
+Release: 34%{?dist}.1
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component
@@ -381,6 +381,9 @@ done
 %endif
 
 %changelog
+* Wed Oct 28 2020 Pingfan Liu <piliu@redhat.com> - 2.0.20-34.1
+- kdump-lib.sh: detect secure boot on s390
+
 * Wed Aug 19 2020 Pingfan Liu <piliu@redhat.com> - 2.0.20-34
 - kdump-lib: disable efifb if hyperv_fb is in use