[PATCH v4 3/8] mkdumprd: change for_each_block_target() to use get_kdump_targets()

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(a)redhat.com&gt; --- v3->v4: -Improved message in is_unresettable(). -"return 1" instead of keeping an index in for_each_block_target(). mkdumprd | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/mkdumprd b/mkdumprd index 337ae87..062b033 100644 --- a/mkdumprd +++ b/mkdumprd @@ -297,20 +297,11 @@ for_each_block_target() { local dev majmin - #check dump target - dev=$(get_block_dump_target) - - if [ -n "$dev" ]; then + for dev in $(get_kdump_targets); do + [ -b "$dev" ] || continue 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 - majmin=$(get_maj_min $dev) - check_block_and_slaves $1 $majmin && return 2 - fi + done return 0 } @@ -329,7 +320,7 @@ is_unresettable() resettable="$(cat $path)" [ $resettable -eq 0 -a "$OVERRIDE_RESETTABLE" -eq 0 ] && { local device=$(udevadm info --query=all --path=/sys/dev/block/$1 | awk -F= '/DEVNAME/{print $2}') - echo "Device $device is unresettable" + echo "Error: Can not save vmcore because device $device is unresettable" return 0 } fi @@ -350,14 +341,6 @@ check_resettable() [ $_ret -eq 0 ] && return - if [ $_ret -eq 1 ]; then - _target=$(get_block_dump_target) - perror "Can not save vmcore to target device $_target . This device can not be initialized in kdump kernel as it is not resettable" - elif [ $_ret -eq 2 ]; then - _target=$(get_default_action_target) - perror "Rootfs device $_target is not resettable, can not be used as the default target, please specify a default action" - fi - return 1 } -- 1.8.3.1