From 650d77e6b9645065d5d3d024c353fecb05f9fc8c Mon Sep 17 00:00:00 2001 From: chenhaixaing Date: Thu, 14 Jul 2022 13:14:41 +0000 Subject: [PATCH 1/2] kdumpctl: ignore deprecated and invalid kdump config option reason:When upgrading the kexec-tools, kdump config option in old version may be deprecated or invalid in new version. The deprecated and invalid kdump config option will cause an error and the kdump service will fail to be started. Ignoring deprecated and invalid kdump config option to fix this. --- kdumpctl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kdumpctl b/kdumpctl index fb264c3..94d7a1b 100755 --- a/kdumpctl +++ b/kdumpctl @@ -255,12 +255,10 @@ check_config() fi ;; net|options|link_delay|disk_timeout|debug_mem_level|blacklist) - echo "Deprecated kdump config option: $config_opt. Refer to kdump.conf manpage for alternatives." - return 1 + echo "Deprecated kdump config option: $config_opt. Refer to kdump.conf manpage for alternatives." ;; *) - echo "Invalid kdump config option $config_opt" - return 1; + echo "Invalid kdump config option $config_opt" ;; esac done <<< "$(read_strip_comments $KDUMP_CONFIG_FILE)" -- Gitee From b53c302c1893a9875be0d311cd1248b302bb8418 Mon Sep 17 00:00:00 2001 From: chenhaixaing Date: Mon, 18 Jul 2022 06:13:08 +0000 Subject: [PATCH 2/2] kdumpctl: ignore deprecated and invalid kdump config option --- kexec-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kexec-tools.spec b/kexec-tools.spec index ce58e0f..a10f54e 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -4,7 +4,7 @@ Name: kexec-tools Version: 2.0.23 -Release: 5 +Release: 6 License: GPLv2 Summary: The kexec/kdump userspace component URL: https://www.kernel.org/ @@ -288,6 +288,9 @@ done %endif %changelog +* Mon Jul 18 2022 chenhaixiang - 2.0.23-6 +- kdumpctl: ignore deprecated and invalid kdump config option + * Fri Mar 11 2022 wangbin - 2.0.23-5 - packing 98-kexec.rules instead of 98-kexec.rules.ppc64 -- Gitee