diff options
| author | Rob Landley <rob@landley.net> | 2016-01-31 14:33:20 -0600 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2016-01-31 14:33:20 -0600 |
| commit | acf34f524d28fc51ac06dae6a1a6948d3e26bb68 (patch) | |
| tree | 8c15852ede7ee877c69daac3c39cae5cd65a971f | |
| parent | 8b847943dea4da31d5235c9bf7d73ce34e371fd0 (diff) | |
| download | toybox-acf34f524d28fc51ac06dae6a1a6948d3e26bb68.tar.gz | |
Fix blkid typo (label wasn't detected in murderfs).
| -rwxr-xr-x | tests/blkid.test | 2 | ||||
| -rw-r--r-- | toys/other/blkid.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/blkid.test b/tests/blkid.test index 25ba9d11..b80cf4f0 100755 --- a/tests/blkid.test +++ b/tests/blkid.test @@ -29,7 +29,7 @@ testing "blkid msdos" 'bzcat "$BDIR"/msdos.bz2 | blkid -' \ testing "blkid ntfs" 'bzcat "$BDIR"/ntfs.bz2 | blkid -' \ '-: UUID="8585600838bfe16e" TYPE="ntfs"\n' "" "" testing "blkid reiserfs" 'bzcat "$BDIR"/reiser3.bz2 | blkid -' \ - '-: LABEL="" UUID="a5b99bec-45cc-41d7-986e-32f4b6fc28f2" TYPE="reiserfs"\n' \ + '-: LABEL="myreiser" UUID="a5b99bec-45cc-41d7-986e-32f4b6fc28f2" TYPE="reiserfs"\n' \ "" "" testing "blkid squashfs" 'bzcat "$BDIR"/squashfs.bz2 | blkid -' \ '-: TYPE="squashfs"\n' "" "" diff --git a/toys/other/blkid.c b/toys/other/blkid.c index 8aab8f74..2880812a 100644 --- a/toys/other/blkid.c +++ b/toys/other/blkid.c @@ -48,7 +48,7 @@ static const struct fstype fstypes[] = { {"jfs", 0x3153464a, 4, 32768, 32920, 16, 32904}, {"nilfs", 0x3434, 2, 1030, 1176, 80, 1192}, {"reiserfs", 0x724573496552ULL, 6, 8244, 8276, 16, 8292}, - {"reiserfs", 0x724573496552ULL, 6, 65588, 65620, 16, 65536}, + {"reiserfs", 0x724573496552ULL, 6, 65588, 65620, 16, 65636}, {"romfs", 0x2d6d6f72, 4, 0, 0,0,0}, {"squashfs", 0x73717368, 4, 0, 0,0,0}, {"xiafs", 0x012fd16d, 4, 572, 0,0,0}, |