]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libfdisk: (dos) don't ignore MBR+FAT use-case
authorKarel Zak <kzak@redhat.com>
Tue, 27 Jul 2021 09:10:53 +0000 (11:10 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 29 Jul 2021 09:55:45 +0000 (11:55 +0200)
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>
libfdisk/src/dos.c

index ce545f85710f3300451478a62baffda1604bf8b4..9cd4ba57cc131616c45c57535db4b6a843a6713d 100644 (file)
@@ -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);