From cdb91409674cfb5d94a374b1e3b2bf1869ecfec7 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 17 Jul 2019 12:35:45 +0200 Subject: libblkid: do not interpret NTFS as MBR # mkntfs -Q -F /dev/sdc old version: # ./blkid -p /dev/sdc /dev/sdc: UUID="0E9E8C5F2F718479" TYPE="ntfs" USAGE="filesystem" PTTYPE="dos" new version:  # ./blkid -p /dev/sdc /dev/sdc: UUID="0E9E8C5F2F718479" TYPE="ntfs" USAGE="filesystem" Reported-by: Mike Fleetwood Signed-off-by: Karel Zak --- libblkid/src/partitions/dos.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libblkid/src/partitions/dos.c') diff --git a/libblkid/src/partitions/dos.c b/libblkid/src/partitions/dos.c index 6c1b519f7..f8b0ee50d 100644 --- a/libblkid/src/partitions/dos.c +++ b/libblkid/src/partitions/dos.c @@ -14,6 +14,7 @@ #include #include "partitions.h" +#include "superblocks/superblocks.h" #include "aix.h" /* see superblocks/vfat.c */ @@ -222,6 +223,12 @@ static int probe_dos_pt(blkid_probe pr, goto nothing; } + /* Another false possitive is NTFS */ + if (blkid_probe_is_ntfs(pr) == 1) { + DBG(LOWPROBE, ul_debug("probably NTFS -- ignore")); + goto nothing; + } + /* * Ugly exception, if the device contains a valid LVM physical volume * and empty MBR (=no partition defined) then it's LVM and MBR should -- cgit v1.2.3-55-g7522