On Thu, Dec 04, 2014 at 05:33:17PM +0800, WANG Chao wrote:
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(a)redhat.com>
Looks good to me.
Acked-by: Vivek Goyal <vgoyal(a)redhat.com>
Vivek
---
dracut-kdump.sh | 7 -------
kdump-lib-initramfs.sh | 8 +++-----
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/dracut-kdump.sh b/dracut-kdump.sh
index 4fef0c5..dc948d1 100755
--- a/dracut-kdump.sh
+++ b/dracut-kdump.sh
@@ -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!"
diff --git a/kdump-lib-initramfs.sh b/kdump-lib-initramfs.sh
index f882b09..57b8304 100755
--- a/kdump-lib-initramfs.sh
+++ b/kdump-lib-initramfs.sh
@@ -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 is_ssh_dump_target || is_raw_dump_target; then
- if [ -z "$user_specified_cc" ]; then
+ 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
-
}
# dump_fs <mount point| device>
--
1.9.3
_______________________________________________
kexec mailing list
kexec(a)lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/kexec