From b1edbe349f9e70c72c4a48565a4fd37c94f20a0a Mon Sep 17 00:00:00 2001
From: Philip Prindeville <philipp@redfish-solutions.com>
Date: Wed, 18 Jan 2023 15:33:30 -0700
Subject: [PATCH] uvol: fix regression in handling fractional megabytes free

Also, fix off-by-one issue when computing free size.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
---
 utils/uvol/Makefile                |  4 ++--
 utils/uvol/files/autopart.defaults | 15 +++------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/utils/uvol/Makefile b/utils/uvol/Makefile
index ab2f8ba616..591a6a6455 100644
--- a/utils/uvol/Makefile
+++ b/utils/uvol/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uvol
-PKG_VERSION:=0.8
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=0.9
+PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=GPL-2.0-or-later
diff --git a/utils/uvol/files/autopart.defaults b/utils/uvol/files/autopart.defaults
index 99ea09406b..007dd3e2e1 100644
--- a/utils/uvol/files/autopart.defaults
+++ b/utils/uvol/files/autopart.defaults
@@ -56,23 +56,14 @@ part_fixup() {
 
 get_free_area() {
 	local found=
-	sfdisk -q -F "$1" 2>/dev/null | while read -r start end sectors size; do
+	sfdisk --bytes -q -F "$1" 2>/dev/null | while read -r start end sectors size; do
 		case $start in
 		*"Unpartitioned"* | *"Units:"* | *"Sector"* | *"Start"* )
 			continue
 			;;
 		[0-9]*)
-			case "$size" in
-				*"k" | *"b")
-					continue
-					;;
-				*"M")
-					[ "${size%%.*M}" -lt 100 ] && continue
-					;;
-				*"G" | *"T")
-					;;
-			esac
-			[ "$found" ] || echo "start=$start, size=$((end - start))"
+			[ $size" -lt $((100 * 1024 * 1024)) ] && continue
+			[ "$found" ] || echo "start=$start, size=$sectors"
 			found=1
 			;;
 		esac