From 83d14e0f39dff5dc9f2edc0b854d383587fa5a96 Mon Sep 17 00:00:00 2001 From: WANG Chao Date: Tue, 5 Aug 2014 13:51:16 +0800 Subject: [PATCH] kdumpctl, fadump: only use lsinitrd when initramfs exists in fadump mode When there's no kdump initramfs for lsinitrd to inspect with, there will be an error: # kdumpctl start /boot/initramfs-3.16.0-rc7+kdump.img does not exist Usage: lsinitrd [options] [ [ [ [...] ]]] Usage: lsinitrd [options] -k -h, --help print a help message and exit. -s, --size sort the contents of the initramfs by size. -m, --mod list modules. -f, --file print the contents of . -k, --kver inspect the initramfs of . No kdump initial ramdisk found. Rebuilding /boot/initramfs-3.16.0-rc7+kdump.img [..] In addition, lsinitrd is a slow operation. We only run it when it's fadump mode, to speed up in kdump mode. Signed-off-by: WANG Chao Acked-by: Vivek Goyal --- kdumpctl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kdumpctl b/kdumpctl index 2bac6df..70d30fa 100755 --- a/kdumpctl +++ b/kdumpctl @@ -365,7 +365,9 @@ check_rebuild() done #check if target initrd has fadump support - initramfs_has_fadump=`lsinitrd -m $TARGET_INITRD | grep ^kdumpbase$ | wc -l` + if [ "$DEFAULT_DUMP_MODE" = "fadump" ] && [ -f "$TARGET_INITRD" ]; then + initramfs_has_fadump=`lsinitrd -m $TARGET_INITRD | grep ^kdumpbase$ | wc -l` + fi if [ $image_time -eq 0 ]; then echo -n "No kdump initial ramdisk found."; echo