summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libblkid/src/superblocks/vfat.c12
-rw-r--r--misc-utils/blkid.c2
-rw-r--r--tests/expected/blkid/low-probe-fat2
-rw-r--r--tests/expected/blkid/low-probe-fat32_cp850_O_tilde2
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_label19
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_NO_NAME7
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty5
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label29
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_NO_NAME7
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase5
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase7
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label29
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_none5
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_NO_NAME5
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label17
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1_xp_label29
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label17
-rw-r--r--tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1_dosfslabel_label29
-rw-r--r--tests/expected/blkid/low-probe-fat32_xp_label17
-rw-r--r--tests/expected/blkid/low-probe-fat32_xp_none5
-rw-r--r--tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label17
-rw-r--r--tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label19
-rw-r--r--tests/expected/blkid/low-probe-small-fat322
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_label1.img.xzbin0 -> 5400 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_NO_NAME.img.xzbin0 -> 5404 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_empty.img.xzbin0 -> 5396 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_label2.img.xzbin0 -> 5400 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_NO_NAME.img.xzbin0 -> 5412 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_erase.img.xzbin0 -> 5412 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_erase.img.xzbin0 -> 5400 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_label2.img.xzbin0 -> 5404 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_none.img.xzbin0 -> 5376 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_NO_NAME.img.xzbin0 -> 5384 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1.img.xzbin0 -> 5380 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1_xp_label2.img.xzbin0 -> 5404 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1.img.xzbin0 -> 5400 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1_dosfslabel_label2.img.xzbin0 -> 5396 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_xp_label1.img.xzbin0 -> 5936 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_xp_none.img.xzbin0 -> 5908 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_xp_none_dosfslabel_label1.img.xzbin0 -> 5908 bytes
-rw-r--r--tests/ts/blkid/images-fs/fat32_xp_none_mlabel_label1.img.xzbin0 -> 5660 bytes
41 files changed, 142 insertions, 6 deletions
diff --git a/libblkid/src/superblocks/vfat.c b/libblkid/src/superblocks/vfat.c
index 3aeba018a..df4ebe371 100644
--- a/libblkid/src/superblocks/vfat.c
+++ b/libblkid/src/superblocks/vfat.c
@@ -308,6 +308,7 @@ static int probe_vfat(blkid_probe pr, const struct blkid_idmag *mag)
struct vfat_super_block *vs;
struct msdos_super_block *ms;
const unsigned char *vol_label = NULL;
+ const unsigned char *boot_label = NULL;
unsigned char *vol_serno = NULL, vol_label_buf[11];
uint16_t sector_size = 0, reserved;
uint32_t cluster_count, fat_size;
@@ -338,8 +339,7 @@ static int probe_vfat(blkid_probe pr, const struct blkid_idmag *mag)
vol_label = vol_label_buf;
}
- if (!vol_label || !memcmp(vol_label, no_name, 11))
- vol_label = ms->ms_label;
+ boot_label = ms->ms_label;
vol_serno = ms->ms_serno;
blkid_probe_set_value(pr, "SEC_TYPE", (unsigned char *) "msdos",
@@ -393,8 +393,7 @@ static int probe_vfat(blkid_probe pr, const struct blkid_idmag *mag)
version = "FAT32";
- if (!vol_label || !memcmp(vol_label, no_name, 11))
- vol_label = vs->vs_label;
+ boot_label = vs->vs_label;
vol_serno = vs->vs_serno;
/*
@@ -423,7 +422,10 @@ static int probe_vfat(blkid_probe pr, const struct blkid_idmag *mag)
}
}
- if (vol_label && memcmp(vol_label, no_name, 11))
+ if (boot_label && memcmp(boot_label, no_name, 11))
+ blkid_probe_set_id_label(pr, "LABEL_FATBOOT", (unsigned char *) boot_label, 11);
+
+ if (vol_label)
blkid_probe_set_label(pr, (unsigned char *) vol_label, 11);
/* We can't just print them as %04X, because they are unaligned */
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 4cd85317f..8179a6ac4 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -254,7 +254,7 @@ static void print_udev_format(const char *name, const char *value)
printf("ID_FS_%s=%s\n", name, enc);
} else if (!strcmp(name, "UUID") ||
- !strcmp(name, "LABEL") ||
+ !strncmp(name, "LABEL", 5) ||
!strcmp(name, "UUID_SUB")) {
blkid_safe_string(value, safe, sizeof(safe));
diff --git a/tests/expected/blkid/low-probe-fat b/tests/expected/blkid/low-probe-fat
index 420121117..9cc2da128 100644
--- a/tests/expected/blkid/low-probe-fat
+++ b/tests/expected/blkid/low-probe-fat
@@ -1,5 +1,7 @@
ID_FS_LABEL=TEST-FAT
ID_FS_LABEL_ENC=TEST-FAT
+ID_FS_LABEL_FATBOOT=TEST-FAT
+ID_FS_LABEL_FATBOOT_ENC=TEST-FAT
ID_FS_SEC_TYPE=msdos
ID_FS_TYPE=vfat
ID_FS_USAGE=filesystem
diff --git a/tests/expected/blkid/low-probe-fat32_cp850_O_tilde b/tests/expected/blkid/low-probe-fat32_cp850_O_tilde
index 096bcbf2c..aa998f085 100644
--- a/tests/expected/blkid/low-probe-fat32_cp850_O_tilde
+++ b/tests/expected/blkid/low-probe-fat32_cp850_O_tilde
@@ -1,5 +1,7 @@
ID_FS_LABEL=___
ID_FS_LABEL_ENC=\xe5\xe5\xe5
+ID_FS_LABEL_FATBOOT=___
+ID_FS_LABEL_FATBOOT_ENC=\xe5\xe5\xe5
ID_FS_TYPE=vfat
ID_FS_USAGE=filesystem
ID_FS_UUID=2826-F9B3
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1 b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1
new file mode 100644
index 000000000..c532983fa
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1
@@ -0,0 +1,9 @@
+ID_FS_LABEL=label1
+ID_FS_LABEL_ENC=label1
+ID_FS_LABEL_FATBOOT=label1
+ID_FS_LABEL_FATBOOT_ENC=label1
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=92B4-BA66
+ID_FS_UUID_ENC=92B4-BA66
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_NO_NAME b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_NO_NAME
new file mode 100644
index 000000000..7860cd159
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_NO_NAME
@@ -0,0 +1,7 @@
+ID_FS_LABEL=NO_NAME
+ID_FS_LABEL_ENC=NO\x20NAME
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=92B4-BA66
+ID_FS_UUID_ENC=92B4-BA66
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty
new file mode 100644
index 000000000..9defdcfa6
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_empty
@@ -0,0 +1,5 @@
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=92B4-BA66
+ID_FS_UUID_ENC=92B4-BA66
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2
new file mode 100644
index 000000000..437a01b61
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_dosfslabel_label2
@@ -0,0 +1,9 @@
+ID_FS_LABEL=label2
+ID_FS_LABEL_ENC=label2
+ID_FS_LABEL_FATBOOT=label2
+ID_FS_LABEL_FATBOOT_ENC=label2
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=92B4-BA66
+ID_FS_UUID_ENC=92B4-BA66
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_NO_NAME b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_NO_NAME
new file mode 100644
index 000000000..7860cd159
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_NO_NAME
@@ -0,0 +1,7 @@
+ID_FS_LABEL=NO_NAME
+ID_FS_LABEL_ENC=NO\x20NAME
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=92B4-BA66
+ID_FS_UUID_ENC=92B4-BA66
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase
new file mode 100644
index 000000000..9defdcfa6
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_mlabel_erase
@@ -0,0 +1,5 @@
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=92B4-BA66
+ID_FS_UUID_ENC=92B4-BA66
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase
new file mode 100644
index 000000000..09299da68
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_erase
@@ -0,0 +1,7 @@
+ID_FS_LABEL_FATBOOT=label1
+ID_FS_LABEL_FATBOOT_ENC=label1
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=92B4-BA66
+ID_FS_UUID_ENC=92B4-BA66
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2
new file mode 100644
index 000000000..a0bb728d3
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_label1_xp_label2
@@ -0,0 +1,9 @@
+ID_FS_LABEL=LABEL2
+ID_FS_LABEL_ENC=LABEL2
+ID_FS_LABEL_FATBOOT=label1
+ID_FS_LABEL_FATBOOT_ENC=label1
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=92B4-BA66
+ID_FS_UUID_ENC=92B4-BA66
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none b/tests/expected/blkid/low-probe-fat32_mkdosfs_none
new file mode 100644
index 000000000..7292f075f
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none
@@ -0,0 +1,5 @@
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=E6B8-AF8C
+ID_FS_UUID_ENC=E6B8-AF8C
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_NO_NAME b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_NO_NAME
new file mode 100644
index 000000000..7292f075f
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_NO_NAME
@@ -0,0 +1,5 @@
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=E6B8-AF8C
+ID_FS_UUID_ENC=E6B8-AF8C
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1
new file mode 100644
index 000000000..4ec217fb4
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1
@@ -0,0 +1,7 @@
+ID_FS_LABEL_FATBOOT=label1
+ID_FS_LABEL_FATBOOT_ENC=label1
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=E6B8-AF8C
+ID_FS_UUID_ENC=E6B8-AF8C
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1_xp_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1_xp_label2
new file mode 100644
index 000000000..046769b79
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_dosfslabel_label1_xp_label2
@@ -0,0 +1,9 @@
+ID_FS_LABEL=LABEL2
+ID_FS_LABEL_ENC=LABEL2
+ID_FS_LABEL_FATBOOT=label1
+ID_FS_LABEL_FATBOOT_ENC=label1
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=E6B8-AF8C
+ID_FS_UUID_ENC=E6B8-AF8C
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1
new file mode 100644
index 000000000..65a5bfd15
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1
@@ -0,0 +1,7 @@
+ID_FS_LABEL=LABEL1
+ID_FS_LABEL_ENC=LABEL1
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=E6B8-AF8C
+ID_FS_UUID_ENC=E6B8-AF8C
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1_dosfslabel_label2 b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1_dosfslabel_label2
new file mode 100644
index 000000000..4eccd8afb
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_mkdosfs_none_xp_label1_dosfslabel_label2
@@ -0,0 +1,9 @@
+ID_FS_LABEL=label2
+ID_FS_LABEL_ENC=label2
+ID_FS_LABEL_FATBOOT=label2
+ID_FS_LABEL_FATBOOT_ENC=label2
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=E6B8-AF8C
+ID_FS_UUID_ENC=E6B8-AF8C
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_xp_label1 b/tests/expected/blkid/low-probe-fat32_xp_label1
new file mode 100644
index 000000000..8e521ebbb
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_xp_label1
@@ -0,0 +1,7 @@
+ID_FS_LABEL=LABEL1
+ID_FS_LABEL_ENC=LABEL1
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=A420-9304
+ID_FS_UUID_ENC=A420-9304
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_xp_none b/tests/expected/blkid/low-probe-fat32_xp_none
new file mode 100644
index 000000000..5db25f8c0
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_xp_none
@@ -0,0 +1,5 @@
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=54B6-DC94
+ID_FS_UUID_ENC=54B6-DC94
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1 b/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1
new file mode 100644
index 000000000..9c5a1b250
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_xp_none_dosfslabel_label1
@@ -0,0 +1,7 @@
+ID_FS_LABEL_FATBOOT=label1
+ID_FS_LABEL_FATBOOT_ENC=label1
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=54B6-DC94
+ID_FS_UUID_ENC=54B6-DC94
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1 b/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1
new file mode 100644
index 000000000..fe9ba1446
--- /dev/null
+++ b/tests/expected/blkid/low-probe-fat32_xp_none_mlabel_label1
@@ -0,0 +1,9 @@
+ID_FS_LABEL=LABEL1
+ID_FS_LABEL_ENC=LABEL1
+ID_FS_LABEL_FATBOOT=LABEL1
+ID_FS_LABEL_FATBOOT_ENC=LABEL1
+ID_FS_TYPE=vfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=54B6-DC94
+ID_FS_UUID_ENC=54B6-DC94
+ID_FS_VERSION=FAT32
diff --git a/tests/expected/blkid/low-probe-small-fat32 b/tests/expected/blkid/low-probe-small-fat32
index 39239e6b3..a0746ced4 100644
--- a/tests/expected/blkid/low-probe-small-fat32
+++ b/tests/expected/blkid/low-probe-small-fat32
@@ -1,5 +1,7 @@
ID_FS_LABEL=TESTVFAT
ID_FS_LABEL_ENC=TESTVFAT
+ID_FS_LABEL_FATBOOT=TESTVFAT
+ID_FS_LABEL_FATBOOT_ENC=TESTVFAT
ID_FS_TYPE=vfat
ID_FS_USAGE=filesystem
ID_FS_UUID=1423-AAE1
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1.img.xz
new file mode 100644
index 000000000..4df4b1da6
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_NO_NAME.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_NO_NAME.img.xz
new file mode 100644
index 000000000..932ab11cb
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_NO_NAME.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_empty.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_empty.img.xz
new file mode 100644
index 000000000..302703183
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_empty.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_label2.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_label2.img.xz
new file mode 100644
index 000000000..1551e1103
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_dosfslabel_label2.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_NO_NAME.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_NO_NAME.img.xz
new file mode 100644
index 000000000..264c440c5
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_NO_NAME.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_erase.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_erase.img.xz
new file mode 100644
index 000000000..f0a95716c
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_mlabel_erase.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_erase.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_erase.img.xz
new file mode 100644
index 000000000..cc4280eef
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_erase.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_label2.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_label2.img.xz
new file mode 100644
index 000000000..66d483813
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_label1_xp_label2.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_none.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_none.img.xz
new file mode 100644
index 000000000..0d084f345
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_none.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_NO_NAME.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_NO_NAME.img.xz
new file mode 100644
index 000000000..a238a01d6
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_NO_NAME.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1.img.xz
new file mode 100644
index 000000000..14860319a
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1_xp_label2.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1_xp_label2.img.xz
new file mode 100644
index 000000000..5401e1f93
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_dosfslabel_label1_xp_label2.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1.img.xz
new file mode 100644
index 000000000..acf01ccb3
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1_dosfslabel_label2.img.xz b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1_dosfslabel_label2.img.xz
new file mode 100644
index 000000000..bff0971d5
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_mkdosfs_none_xp_label1_dosfslabel_label2.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_xp_label1.img.xz b/tests/ts/blkid/images-fs/fat32_xp_label1.img.xz
new file mode 100644
index 000000000..97d71e9f2
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_xp_label1.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_xp_none.img.xz b/tests/ts/blkid/images-fs/fat32_xp_none.img.xz
new file mode 100644
index 000000000..a8c819ed7
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_xp_none.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_xp_none_dosfslabel_label1.img.xz b/tests/ts/blkid/images-fs/fat32_xp_none_dosfslabel_label1.img.xz
new file mode 100644
index 000000000..0ebe6beca
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_xp_none_dosfslabel_label1.img.xz
Binary files differ
diff --git a/tests/ts/blkid/images-fs/fat32_xp_none_mlabel_label1.img.xz b/tests/ts/blkid/images-fs/fat32_xp_none_mlabel_label1.img.xz
new file mode 100644
index 000000000..5a7a77403
--- /dev/null
+++ b/tests/ts/blkid/images-fs/fat32_xp_none_mlabel_label1.img.xz
Binary files differ