[kexec-tools] kdump: fix save vmcore path for fadump

WANG Chao wangchao at fedoraproject.org
Mon Oct 27 13:14:01 UTC 2014


commit d1483f9b28cd060a07ebd6dcd7e56f6519748607
Author: Hari Bathini <hbathini at linux.vnet.ibm.com>
Date:   Thu Oct 23 11:54:39 2014 +0530

    kdump: fix save vmcore path for fadump
    
    With fadump support, dracut-kdump.sh script is installed into default
    initrd to capture vmcore generated by firmware assisted dump. Thus in
    fadump case, the same initrd is being used for normal boot as well as
    boot after system crash. Hence a device node, added by firmware while
    system crashes, is checked to identify if it is a normal boot or boot
    after crash to determine whether or not capture vmcore. While testing
    fadump in  fedora21 alpha, observed that  vmcore capture is initiated
    even during normal boot, inspite of this check, with the below error:
    
        "kdump.sh[451]: /bin/kdump.sh: line 5: return: can only `return'
         from a function or sourced script"
    
    The below patch tries to fix this issue.
    
    Signed-off-by: Hari Bathini <hbathini at linux.vnet.ibm.com>
    Acked-by: Dave Young <dyoung at redhat.com>
    Acked-by: WANG Chao <chaowang at redhat.com>
    Acked-by: Vivek Goyal <vgoyal at redhat.com>

 dracut-kdump.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/dracut-kdump.sh b/dracut-kdump.sh
index 600e84e..4fef0c5 100755
--- a/dracut-kdump.sh
+++ b/dracut-kdump.sh
@@ -2,7 +2,7 @@
 
 # continue here only if we have to save dump.
 if [ -f /etc/fadump.initramfs ] && [ ! -f /proc/device-tree/rtas/ibm,kernel-dump ]; then
-	return
+	exit 0
 fi
 
 exec &> /dev/console


More information about the scm-commits mailing list