libblkid: Keep NTFS name unmodified and mount driver independent

We need stable filesystem names (types) even though there are multiple
filesystem drivers. libmount now provides a way to map the stable
fs-types to various mount-types.

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

diff --git a/libblkid/src/superblocks/ntfs.c b/libblkid/src/superblocks/ntfs.c
index 42c8565df4e283a61c7223e0534dd61e6d98357f..8ce557a113c1158aba0c9b86155f66faace3bdfa 100644 (file)
--- a/libblkid/src/superblocks/ntfs.c
+++ b/libblkid/src/superblocks/ntfs.c
@@ -248,7 +248,7 @@ int blkid_probe_is_ntfs(blkid_probe pr)
 
 const struct blkid_idinfo ntfs_idinfo =
 {
-       .name           = "ntfs3",
+       .name           = "ntfs",
        .usage          = BLKID_USAGE_FILESYSTEM,
        .probefunc      = probe_ntfs,
        .magics         =

diff --git a/tests/expected/blkid/low-probe-ntfs b/tests/expected/blkid/low-probe-ntfs
index 3c364bca022dd4120333b33c975aec32f175af7c..d18e929a892aba48f778e21c41288ee7a4d22fd9 100644 (file)
--- a/tests/expected/blkid/low-probe-ntfs
+++ b/tests/expected/blkid/low-probe-ntfs
@@ -3,7 +3,7 @@ ID_FS_FSBLOCKSIZE=4096
 ID_FS_FSSIZE=10485248
 ID_FS_LABEL=Новый_том
 ID_FS_LABEL_ENC=Новый\x20том
-ID_FS_TYPE=ntfs3
+ID_FS_TYPE=ntfs
 ID_FS_USAGE=filesystem
 ID_FS_UUID=09CBB6DE30C87310
 ID_FS_UUID_ENC=09CBB6DE30C87310