Merge ~bladernr/plainbox-provider-checkbox:fix-disk_stress_ng into plainbox-provider-checkbox:master

[Jeff Lane ]

Fixes bug when running disk_stress_ng on /dev/mapper devices where we were looking at the wrong field when looking at partition or volume size.

Also adds bits to check for both lvm and part TYPE when examining lsblk output.

[Maciej Kisielewski (kissiel)]

Good stuff!

I checked the field `cut`ting and can confirm that '-f 2' was wrong.

+1

review: Approve

diff --git a/bin/disk_stress_ng b/bin/disk_stress_ng
index df5694e..3668f63 100755
--- a/bin/disk_stress_ng
+++ b/bin/disk_stress_ng
@@ -103,7 +103,7 @@ find_largest_partition() {
     largest_size=0
     mapper_string="dm-"
     if [ "${disk_device#*$mapper_string}" = "$disk_device" ]; then
-        partitions=$(lsblk -b -l -n -o NAME,SIZE,TYPE,MOUNTPOINT $disk_device | grep part | tr -s " ")
+        partitions=$(lsblk -b -l -n -o NAME,SIZE,TYPE,MOUNTPOINT $disk_device | grep -E 'part|lvm' | tr -s " ")
     else
         partitions=$(lsblk -b -l -n -o NAME,SIZE,TYPE,MOUNTPOINT $disk_device)
     fi
@@ -113,7 +113,7 @@ find_largest_partition() {
             part_size=$(echo "$partitions" | grep "$partition " | cut -d " " -f 2)
             part_location="/dev/$partition"
         elif [ -b "/dev/mapper/$partition" ]; then
-            part_size=$(echo "$partitions" | grep "$partition " | cut -d " " -f 3)
+	    part_size=$(echo "$partitions" | grep "$partition " | cut -d " " -f 2)
             part_location="/dev/mapper/$partition"
         else
             echo "$partition not found!"