Resolves: bz1451717 https://bugzilla.redhat.com/1451717
Now that we have get_kdump_targets(), use it to simplify the code.
Signed-off-by: Xunlei Pang xlpang@redhat.com --- mkdumprd | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/mkdumprd b/mkdumprd index 337ae87..0fe1b30 100644 --- a/mkdumprd +++ b/mkdumprd @@ -295,22 +295,15 @@ get_override_resettable() # $1: function name for_each_block_target() { - local dev majmin + local index dev majmin
- #check dump target - dev=$(get_block_dump_target) - - if [ -n "$dev" ]; then - majmin=$(get_maj_min $dev) - check_block_and_slaves $1 $majmin && return 1 - fi - - #check rootfs when default action dump_to_rootfs is set - dev=$(get_default_action_target) - if [ -n "$dev" ]; then + index=0 + for dev in $(get_kdump_targets); do + index=$((index+1)) + [ -b "$dev" ] || continue majmin=$(get_maj_min $dev) - check_block_and_slaves $1 $majmin && return 2 - fi + check_block_and_slaves $1 $majmin && return $index + done
return 0 }