[kexec-tools: 2/3] do_default_action cleanup
Dave Young
yangrr at fedoraproject.org
Mon May 14 02:42:24 UTC 2012
commit e27c9f6c52074a9b11073a49a701c58bc88d6ba1
Author: Dave Young <dyoung at redhat.com>
Date: Mon May 7 14:12:08 2012 +0800
do_default_action cleanup
Resolves: bz805773
simplify logic and remove redundant code:
put do_default_action to add_dump_code
Signed-off-by: Dave Young <dyoung at redhat.com>
Acked-by: Vivek Goyal <vgoyal at redhat.com>
dracut-kdump.sh | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/dracut-kdump.sh b/dracut-kdump.sh
index ca9ab43..c66ce0d 100755
--- a/dracut-kdump.sh
+++ b/dracut-kdump.sh
@@ -30,7 +30,7 @@ do_default_action()
add_dump_code()
{
- DUMP_INSTRUCTION="$1"
+ DUMP_INSTRUCTION="$1 || do_default_action"
}
get_mp()
@@ -165,17 +165,17 @@ read_kdump_conf()
do
case "$config_opt" in
ext[234]|xfs|btrfs|minix)
- add_dump_code "dump_localfs $config_val || do_default_action"
+ add_dump_code "dump_localfs $config_val"
;;
raw)
- add_dump_code "dump_raw $config_val || do_default_action"
+ add_dump_code "dump_raw $config_val"
;;
net)
wait_for_net_ok
if [[ "$config_val" =~ "@" ]]; then
- add_dump_code "dump_ssh $SSH_KEY_LOCATION $config_val || do_default_action"
+ add_dump_code "dump_ssh $SSH_KEY_LOCATION $config_val"
else
- add_dump_code "dump_nfs $config_val || do_default_action"
+ add_dump_code "dump_nfs $config_val"
fi
;;
esac
More information about the scm-commits
mailing list