diff options
| author | Manuel Bentele | 2019-08-21 14:58:42 +0200 |
|---|---|---|
| committer | Manuel Bentele | 2019-08-21 14:58:42 +0200 |
| commit | 0692b963aa3cb846d8abab5ef5247c4dbb3fec96 (patch) | |
| tree | f13776d25da3e1adc1445aef22e7566ac98cbe84 /libfdisk/src/dos.c | |
| parent | losetup: added file format option to the man page (diff) | |
| parent | partx: document -d vs. --nr and fix test (diff) | |
| download | kernel-qcow2-util-linux-0692b963aa3cb846d8abab5ef5247c4dbb3fec96.tar.gz kernel-qcow2-util-linux-0692b963aa3cb846d8abab5ef5247c4dbb3fec96.tar.xz kernel-qcow2-util-linux-0692b963aa3cb846d8abab5ef5247c4dbb3fec96.zip | |
lib/losetup: merge remote-tracking branch 'util-linux/master'kernel-qcow2
Signed-off-by: Manuel Bentele <development@manuel-bentele.de>
Diffstat (limited to 'libfdisk/src/dos.c')
| -rw-r--r-- | libfdisk/src/dos.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c index 6dc276e8a..fc5bcc651 100644 --- a/libfdisk/src/dos.c +++ b/libfdisk/src/dos.c @@ -814,6 +814,12 @@ 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); |