From: Theodore Ts'o Date: Tue, 25 Jan 2005 08:26:10 +0000 (-0500) Subject: probe.c: Windows can perform a "quick format" that doesn't clear X-Git-Tag: E2FSPROGS-1_36~30 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9d0f46169f8c3df2e07b262b1f1b3f3c75aba2c6;p=tools%2Fe2fsprogs.git probe.c: Windows can perform a "quick format" that doesn't clear enough of the partition that the blkid probes can get confused. Do the NTFS test first to deal with this Windows misfeature. (Addresses Debian Bug #291990) --- diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog index 28e9724..3a16375 100644 --- a/lib/blkid/ChangeLog +++ b/lib/blkid/ChangeLog @@ -1,3 +1,10 @@ +2005-01-25 Theodore Ts'o + + * probe.c: Windows can perform a "quick format" that doesn't clear + enough of the partition that the blkid probes can get + confused. Do the NTFS test first to deal with this + Windows misfeature. (Addresses Debian Bug #291990) + 2005-01-21 Theodore Ts'o * probe.c (probe_oracleasm): Add support for recognizing Oracle diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index d203c88..e8f3be2 100644 --- a/lib/blkid/probe.c +++ b/lib/blkid/probe.c @@ -467,6 +467,7 @@ static int probe_oracleasm(int fd __BLKID_ATTR((unused)), static struct blkid_magic type_array[] = { /* type kboff sboff len magic probe */ { "oracleasm", 0, 32, 8, "ORCLDISK", probe_oracleasm }, + { "ntfs", 0, 3, 8, "NTFS ", 0 }, { "jbd", 1, 0x38, 2, "\123\357", probe_jbd }, { "ext3", 1, 0x38, 2, "\123\357", probe_ext3 }, { "ext2", 1, 0x38, 2, "\123\357", probe_ext2 }, @@ -475,7 +476,6 @@ static struct blkid_magic type_array[] = { { "reiserfs", 64, 0x34, 9, "ReIsEr3Fs", probe_reiserfs }, { "reiserfs", 64, 0x34, 8, "ReIsErFs", probe_reiserfs }, { "reiserfs", 8, 20, 8, "ReIsErFs", probe_reiserfs }, - { "ntfs", 0, 3, 8, "NTFS ", 0 }, { "vfat", 0, 0x52, 5, "MSWIN", probe_vfat }, { "vfat", 0, 0x52, 8, "FAT32 ", probe_vfat }, { "vfat", 0, 0x36, 5, "MSDOS", probe_msdos },