make the fat partition detection work on gpt

We were checking for the mbr type of 'c'. Instead of checking for that and the GUID for a generic MS data partition, make things easier and just check that it's a vfat filesystem. With that, the 4MB, and the subsequent check for the label this appears to be enough belts and suspenders. Signed-off-by: Dirk Hohndel <[email protected]>
MichaIng · Sep 9, 2023 · e69a24d · e69a24d
1 parent c801382
commit e69a24d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/rootfs/var/lib/dietpi/services/fs_partition_resize.sh b/rootfs/var/lib/dietpi/services/fs_partition_resize.sh
@@ -39,8 +39,9 @@
 		exit 1
 	fi
 
-	# check if the last partition is a 4MB partition with the Windows/FAT type
-	if sfdisk -l "$ROOT_DRIVE" | tail -1 | grep -E "\s4M\s+c\s" > /dev/null 2>&1
+	# check if the last partition is a 4MB partition with a vfat filesystem
+	LAST_FS_TYPE=$(lsblk -no FSTYPE "$ROOT_DRIVE" | tail -1)
+	if sfdisk -l "$ROOT_DRIVE" | tail -1 | grep -E "\s4M\s" > /dev/null 2>&1 && [[ $LAST_FS_TYPE='vfat' ]]
 	then
 		# the last partition is a 4M FAT filesystem - let's check if it is ours
 		SETUP_PART=$(sfdisk -l "$ROOT_DRIVE" | tail -1 | mawk '{print $1}')