From c23186d3ee6001b78c843fc3609575306c687ba2 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Sun, 20 Mar 2016 11:13:22 -0700 Subject: blkid: Handle short/empty vfat labels; update tests vfat labels have a fixed space allocated for them. In the case of a shorter label, the remaining bytes are padded with spaces. A vfat filesystem with no label (i.e. that will show up in Windows as "Local Disk (X:)" or "Removable Disk (X:)") is stored as "NO NAME ". Both of these changes match behavior from util-linux. --- tests/blkid.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/blkid.test b/tests/blkid.test index 9cde4899..c99b2a42 100755 --- a/tests/blkid.test +++ b/tests/blkid.test @@ -25,7 +25,7 @@ testing "f2fs" 'bzcat "$BDIR"/f2fs.bz2 | blkid -' \ '-: LABEL="" UUID="b53d3619-c204-4c0b-8504-36363578491c" TYPE="f2fs"\n' \ "" "" testing "msdos" 'bzcat "$BDIR"/msdos.bz2 | blkid -' \ - '-: LABEL="mymsdos " UUID="5108-1e6e" TYPE="vfat"\n' "" "" + '-: LABEL="mymsdos" UUID="5108-1e6e" TYPE="vfat"\n' "" "" testing "ntfs" 'bzcat "$BDIR"/ntfs.bz2 | blkid -' \ '-: UUID="8585600838bfe16e" TYPE="ntfs"\n' "" "" testing "reiserfs" 'bzcat "$BDIR"/reiser3.bz2 | blkid -' \ @@ -34,7 +34,7 @@ testing "reiserfs" 'bzcat "$BDIR"/reiser3.bz2 | blkid -' \ testing "squashfs" 'bzcat "$BDIR"/squashfs.bz2 | blkid -' \ '-: TYPE="squashfs"\n' "" "" testing "vfat" 'bzcat "$BDIR"/vfat.bz2 | blkid -' \ - '-: LABEL="myvfat " UUID="1db9-5673" TYPE="vfat"\n' "" "" + '-: LABEL="myvfat" UUID="1db9-5673" TYPE="vfat"\n' "" "" testing "xfs" 'bzcat "$BDIR"/xfs.bz2 | blkid -' \ '-: LABEL="XFS_test" UUID="d63a1dc3-27d5-4dd4-8b38-f4f97f495c6f" TYPE="xfs"\n' \ "" "" -- cgit v1.2.3