diff --git a/kdumpctl b/kdumpctl index ebba5f8..7f51b2e 100755 --- a/kdumpctl +++ b/kdumpctl @@ -1638,10 +1638,13 @@ reset_crashkernel() fi } -# to tell if it's package install other than upgrade -_is_package_install() +_is_bootloader_installed() { - [[ -f /tmp/kexec_tools_package_install ]] + if [[ $(uname -r) == s390x ]]; then + test -f /etc/zipl.conf + else + test -f /boot/grub2/grub.cfg + fi } # update the crashkernel value in GRUB_ETC_DEFAULT if necessary @@ -1653,10 +1656,6 @@ update_crashkernel_in_grub_etc_default_after_update() local _crashkernel _fadump_val local _dump_mode _old_default_crashkernel _new_default_crashkernel - if _is_package_install; then - return - fi - if [[ $(uname -m) == s390x ]]; then return fi @@ -1686,6 +1685,10 @@ reset_crashkernel_after_update() local _kernel _crashkernel _dump_mode _fadump_val _old_default_crashkernel _new_default_crashkernel declare -A _crashkernel_vals + if ! _is_bootloader_installed; then + return + fi + _crashkernel_vals[old_kdump]=$(cat /tmp/old_default_crashkernel 2> /dev/null) _crashkernel_vals[old_fadump]=$(cat /tmp/old_default_crashkernel_fadump 2> /dev/null) _crashkernel_vals[new_kdump]=$(get_default_crashkernel kdump) @@ -1738,7 +1741,7 @@ reset_crashkernel_for_installed_kernel() # During package install, only try to reset crashkernel for osbuild # thus to avoid calling grubby when installing os via anaconda - if _is_package_install && ! _is_osbuild; then + if ! _is_bootloader_installed && ! _is_osbuild; then return fi diff --git a/kexec-tools.spec b/kexec-tools.spec index 9c68263..0b54ab4 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -283,11 +283,6 @@ if [ ! -f /run/ostree-booted ] && [ $1 == 2 ] && grep -q get-default-crashkernel kdumpctl get-default-crashkernel fadump > /tmp/old_default_crashkernel_fadump 2>/dev/null %endif fi -# indicate it's package install so kdumpctl later will only reset crashkernel -# value for osbuild. -if [ $1 == 1 ]; then - touch /tmp/kexec_tools_package_install -fi # don't block package update :