rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

kdump-initramfs-lib: Fix core_collector issue

Browse Source 
In ssh or raw dump case, if user do not specify "core_collector" in
kdump.conf, kdump will fail. Because global DEFAULT_CORE_COLLECTOR
variable isn't applied to CORE_COLLECTOR. Now fix it and clean up the
duplicate code in kdump.sh.

Signed-off-by: WANG Chao <chaowang@redhat.com>
Acked-by: Dave Young <dyoung@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
WANG Chao 2014-11-28 13:55:39 +08:00
parent eedfc174a6
commit 1742affe2c
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dracut-kdump.sh
View File

@ -169,13 +169,6 @@ fence_kdump_notify()
read_kdump_conf
fence_kdump_notify
if [ -z "$CORE_COLLECTOR" ];then
CORE_COLLECTOR=$DEFAULT_CORE_COLLECTOR
if is_ssh_dump_target || is_raw_dump_target; then
CORE_COLLECTOR="$CORE_COLLECTOR -F"
fi
fi
get_host_ip
if [ $? -ne 0 ]; then
echo "kdump: get_host_ip exited with non-zero status!"

6
kdump-lib-initramfs.sh
View File

@ -22,7 +22,6 @@ NEWROOT="/sysroot"
get_kdump_confs()
{
local config_opt config_val
local user_specified_cc
while read config_opt config_val;
do
@ -34,7 +33,6 @@ get_kdump_confs()
;;
core_collector)
[ -n "$config_val" ] && CORE_COLLECTOR="$config_val"
user_specified_cc=yes
;;
sshkey)
if [ -f "$config_val" ]; then
@ -75,12 +73,12 @@ get_kdump_confs()
esac
done < $KDUMP_CONF
if [ -z "$CORE_COLLECTOR" ]; then
CORE_COLLECTOR="$DEFAULT_CORE_COLLECTOR"
if is_ssh_dump_target || is_raw_dump_target; then
if [ -z "$user_specified_cc" ]; then
CORE_COLLECTOR="$CORE_COLLECTOR -F"
fi
fi
}
# dump_fs <mount point| device>