From afa4a35d3d379626697fc13f768befbd2c925cf6 Mon Sep 17 00:00:00 2001 From: Pratyush Anand Date: Thu, 12 May 2016 10:26:39 +0530 Subject: [PATCH] kdumpctrl: kdump feasibility should fail if no crash memory Currently initramfs is rebuilt even when crash kernel memory is not available and then latter on kdump service is failed. Its better to fail during feasibility itself when crash memory is not reserved. Signed-off-by: Pratyush Anand Acked-by: Xunlei Pang Acked-by: Dave Young --- kdumpctl | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/kdumpctl b/kdumpctl index 34b64f3..fcc9ad0 100755 --- a/kdumpctl +++ b/kdumpctl @@ -559,13 +559,6 @@ need_64bit_headers() # as the currently running kernel. load_kdump() { - MEM_RESERVED=$(cat /sys/kernel/kexec_crash_size) - if [ $MEM_RESERVED -eq 0 ] - then - echo "No memory reserved for crash kernel." >&2 - return 1 - fi - ARCH=`uname -m` if [ "$ARCH" == "i686" -o "$ARCH" == "i386" ] then @@ -867,12 +860,26 @@ is_secure_boot_enforced() return 1 } +check_crash_mem_reserved() +{ + MEM_RESERVED=$(cat /sys/kernel/kexec_crash_size) + if [ $MEM_RESERVED -eq 0 ] + then + echo "No memory reserved for crash kernel." >&2 + return 1 + fi + + return 0 +} + check_kdump_feasibility() { if [ ! -e /sys/kernel/kexec_crash_loaded ]; then echo "Kdump is not supported on this kernel" return 1 fi + check_crash_mem_reserved + return $? } check_fence_kdump_config()