From: Karel Zak <kzak@redhat.com>
Date: Tue, 27 Jul 2021 09:10:53 +0000 (+0200)
Subject: libfdisk: (dos) don't ignore MBR+FAT use-case
X-Git-Tag: v2.37.2~24
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6e8af4695e7e37eae392caec9ce42801ecc196de;p=thirdparty%2Futil-linux.git

libfdisk: (dos) don't ignore MBR+FAT use-case

Since libblkid commit 751eca28fcfa1e325770904d7181b22e48c72b29 it does
not ignore FAT on whole-disks, so now libfdisk sees collision between
FAT and MBR. It's fine to report the collision to users, but we should
not ignore the MBR.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index ce545f8571..9cd4ba57cc 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -834,12 +834,6 @@ static int dos_probe_label(struct fdisk_context *cxt)
 	if (!mbr_is_valid_magic(cxt->firstsector))
 		return 0;
 
-	/* ignore disks with FAT */
-	if (cxt->collision &&
-	    (strcmp(cxt->collision, "vfat") == 0 ||
-	     strcmp(cxt->collision, "ntfs") == 0))
-		return 0;
-
 	dos_init(cxt);
 
 	get_partition_table_geometry(cxt, &h, &s);