Skip to content

Commit d41c648

Browse files
crassDaniel Kiper
authored and
Daniel Kiper
committed
tests: Switch to requiring exfatprogs from exfat-utils
The current Debian stable, now 12, has dropped the exfat-utils package that the exfat filesystem test requires to run. There is an exfatprogs package that replaces exfat-utils, though it is not a drop-in replacement because mkfs.exfat has differing command line option names. Note, that we're not yet switching to using the exfat kernel module because this allows the testings on kernels that do not have the module. Update mkfs.exfat usage to adhere to the different exfatprogs usage. Also, the exfatprogs mkfs.exfat, following the exfat specification more closely, only allows a maximum of 22 bytes of UTF-16 characters in the volume label compared to 30 bytes from exfat-utils. So the exfat label test is updated accordingly. Update documentation to note that exfatprogs is now needed and also exfat-fuse, which is needed do the fuse mount. Signed-off-by: Glenn Washburn <[email protected]> Reviewed-by: Daniel Kiper <[email protected]>
1 parent c1ee4da commit d41c648

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

INSTALL

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ Prerequisites for make-check:
8383
exfat FUSE filesystem
8484
* The following are Debian named packages required mostly for the full
8585
suite of filesystem testing (but some are needed by other tests as well):
86-
- btrfs-progs, dosfstools, e2fsprogs, erofs-utils, exfat-utils, f2fs-tools,
87-
genromfs, hfsprogs, jfsutils, nilfs-tools, ntfs-3g, reiserfsprogs,
88-
squashfs-tools, reiserfsprogs, udftools, xfsprogs, zfs-fuse
86+
- btrfs-progs, dosfstools, e2fsprogs, erofs-utils, exfatprogs, exfat-fuse,
87+
f2fs-tools, genromfs, hfsprogs, jfsutils, nilfs-tools, ntfs-3g,
88+
reiserfsprogs, squashfs-tools, reiserfsprogs, udftools, xfsprogs, zfs-fuse
8989
- exfat-fuse, if not using the exfat kernel module
9090
- gzip, lzop, xz-utils
9191
- attr, cpio, g++, gawk, parted, recode, tar, util-linux

tests/util/grub-fs-tester.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -362,9 +362,9 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
362362
x"f2fs")
363363
FSLABEL="grub_;/testé䏌䐓䏕киритiurewfceniuewruewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoirvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoircreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoiq";;
364364

365-
# FS LIMITATION: exfat is at most 15 UTF-16 chars
365+
# FS LIMITATION: exfat is at most 22 bytes of UTF-16 chars
366366
x"exfat")
367-
FSLABEL="géт ;/莭莽😁кир";;
367+
FSLABEL="éт ;/莭莽😁";;
368368
# FS LIMITATION: ntfs label is at most ?? UTF-16 chars
369369
x"ntfs"*)
370370
FSLABEL="grub_;/testéтi u莭😁茝кириrewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvniwnivrewiuvcrewvnuewvrrrewniureifiuewifjiww";;
@@ -710,7 +710,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
710710
MOUNTFS="btrfs"
711711
;;
712712
x"exfat")
713-
"mkfs.$fs" -s $((BLKSIZE/512)) -n "$FSLABEL" "${MOUNTDEVICE}"
713+
"mkfs.$fs" -c $SECSIZE -L "$FSLABEL" "${MOUNTDEVICE}"
714714
MOUNTOPTS="iocharset=utf8,"
715715
MOUNTFS="exfat-fuse";;
716716
x"minix")

0 commit comments

Comments
 (0)