From 5270d40dd0b690d4be628f937e508cdc80dab1d9 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 31 Aug 2021 16:07:51 -0700 Subject: [PATCH] Don't exit 1 from 92-crashkernel.install if zipl is absent (#1993505) At least, this is a plausible suspect for #1993505 - thanks to @kevin for identifying it - and fixing it should be safe and correct, so we may as well do it and see if it helps. --- 92-crashkernel.install | 2 +- kexec-tools.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/92-crashkernel.install b/92-crashkernel.install index 7613bc6..de5b2fb 100755 --- a/92-crashkernel.install +++ b/92-crashkernel.install @@ -61,7 +61,7 @@ set_kernel_ck() { [[ -f /etc/zipl.conf ]] && zipl_arg="--zipl" grubby --args "$ck_cmdline" --update-kernel "$entry" $zipl_arg - [[ $zipl_arg ]] && zipl > /dev/null + [[ $zipl_arg ]] && zipl > /dev/null ||: } case "$COMMAND" in diff --git a/kexec-tools.spec b/kexec-tools.spec index 58be768..7db9f9c 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -5,7 +5,7 @@ Name: kexec-tools Version: 2.0.22 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Summary: The kexec/kdump userspace component @@ -384,6 +384,9 @@ done %endif %changelog +* Tue Aug 31 2021 Adam Williamson - 2.0.22-7 +- Don't exit 1 from 92-crashkernel.install if zipl is absent (#1993505) + * Fri Aug 20 2021 Kairui Song - 2.0.22-6 - Remove hard requirement on grubby - Clear old crashkernl=auto in comment and doc