From 3501314aa57cf0110eabbf496d2b895111c9240b Mon Sep 17 00:00:00 2001
From: Thierry Laurion <insurgo@riseup.net>
Date: Mon, 6 Jan 2025 10:38:48 -0500
Subject: [PATCH] bugfix: make sure busybox's fdisk output parsing is not
 positional, support qemu and fix debug output

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
---
 initrd/etc/functions     | 23 +++++++++++++++--------
 initrd/etc/gui_functions |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/initrd/etc/functions b/initrd/etc/functions
index 3c4b092c7..d97403a0b 100755
--- a/initrd/etc/functions
+++ b/initrd/etc/functions
@@ -244,17 +244,24 @@ device_has_partitions() {
 	# to satisfy fdisk.  In that case, fdisk prints a partition table header
 	# but no partitions.
 	#
-	# This check covers that: [ $(fdisk -l "$b" | wc -l) -eq 5 ]
-	# In both cases the output is 5 lines: 3 about device info, 1 empty line
-	# and the 5th will be the table header or the invalid message.
+	# busybox's fdisk doesn't support >2TB devices since >2^32 sectors
+	# TODO: this is https://bugs.busybox.net/show_bug.cgi?id=16276
+	# revise logic when this is fixed, otherwise we can't rely on
+	# positional output, we need to force strings match only.
 	local DISK_DATA=$(fdisk -l "$DEVICE")
-	if echo "$DISK_DATA" | grep -q "doesn't contain a valid partition table" || \
-		[ "$(echo "$DISK_DATA" | wc -l)" -eq 5 ]; then
+	if echo "$DISK_DATA" | grep -q "doesn't contain a valid partition table"; then
 		# No partition table
 		return 1
 	fi
-	# There is a partition table
-	return 0
+
+	# Check for partition entries in the fdisk output
+	if echo "$DISK_DATA" | grep -q "^/dev"; then
+		# There are partitions
+		return 0
+	fi
+
+	# No partitions found
+	return 1
 }
 
 list_usb_storage() {
@@ -661,7 +668,7 @@ is_gpt_bios_grub() {
 
 	# Now we know the device and partition number, get the type.  This is
 	# specific to GPT disks, MBR disks are shown differently by fdisk.
-	TRACE "$PART_DEV is partition $NUMBER of $DEVICE"
+	DEBUG "$PART_DEV is partition $NUMBER of $DEVICE"
 	if [ "$(fdisk -l "/dev/$DEVICE" | awk '$1 == '"$NUMBER"' {print $5}')" == grub ]; then
 		return 0
 	fi
diff --git a/initrd/etc/gui_functions b/initrd/etc/gui_functions
index 38958b1ab..cb73efd37 100755
--- a/initrd/etc/gui_functions
+++ b/initrd/etc/gui_functions
@@ -181,7 +181,7 @@ show_system_info()
   kernel=$(uname -s -r)
 
   whiptail_type $BG_COLOR_MAIN_MENU --title 'System Info' \
-    --msgbox "${BOARD_NAME}\n\nFW_VER: ${FW_VER}\nKernel: ${kernel}\n\nCPU: ${cpustr}\nRAM: ${memtotal} GB\n$battery_status\n$(fdisk -l | grep -e '/dev/sd.:' -e '/dev/nvme.*:' | sed 's/B,.*/B/')" 0 80
+    --msgbox "${BOARD_NAME}\n\nFW_VER: ${FW_VER}\nKernel: ${kernel}\n\nCPU: ${cpustr}\nRAM: ${memtotal} GB\n$battery_status\n$(fdisk -l | grep -e '/dev/sd.:' -e '/dev/nvme.*:' -e '/dev/vd.:' | sed 's/B,.*/B/')" 0 80
 }
 
 # Get "Enable" or "Disable" to display in the configuration menu, based on a