From e5c3e969855c1a4ea5df6e0a613e473975605546 Mon Sep 17 00:00:00 2001 From: Pingfan Liu Date: Tue, 18 Jan 2022 10:42:00 +0800 Subject: [PATCH] move variable FENCE_KDUMP_SEND from kdump-lib.sh to kdump-lib-initramfs.sh Resolves: bz2031736 Upstream: Fedora Conflict: None commit 3cd561fcbcb3ba4f285e746d81e1e6dae17447c3 (HEAD) Author: Pingfan Liu Date: Tue Jan 18 10:42:00 2022 +0800 move variable FENCE_KDUMP_SEND from kdump-lib.sh to kdump-lib-initramfs.sh Since kdump-lib-initramfs.sh is included by kdump-lib.sh, and FENCE_KDUMP_SEND is used by both 1st and 2nd kernel, moving FENCE_KDUMP_SEND from kdump-lib.sh to kdump-lib-initramfs.sh. Signed-off-by: Pingfan Liu Acked-by: Tao Liu Signed-off-by: Pingfan Liu --- kdump-lib-initramfs.sh | 2 ++ kdump-lib.sh | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kdump-lib-initramfs.sh b/kdump-lib-initramfs.sh index c1fd75f..9be0fe9 100755 --- a/kdump-lib-initramfs.sh +++ b/kdump-lib-initramfs.sh @@ -5,6 +5,8 @@ DEFAULT_PATH="/var/crash/" KDUMP_CONFIG_FILE="/etc/kdump.conf" +FENCE_KDUMP_CONFIG_FILE="/etc/sysconfig/fence_kdump" +FENCE_KDUMP_SEND="/usr/libexec/fence_kdump_send" # Read kdump config in well formated style kdump_read_conf() diff --git a/kdump-lib.sh b/kdump-lib.sh index 2ea51be..a40617a 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -5,8 +5,6 @@ . /usr/lib/kdump/kdump-lib-initramfs.sh -FENCE_KDUMP_CONFIG_FILE="/etc/sysconfig/fence_kdump" -FENCE_KDUMP_SEND="/usr/libexec/fence_kdump_send" FADUMP_ENABLED_SYS_NODE="/sys/kernel/fadump_enabled" is_fadump_capable()