Skip to content

Commit ee283b1

Browse files
crassDaniel Kiper
authored andcommitted
tests/util/grub-fs-tester: Use CSMACINTOSH encoding instead of macroman
From Debian 12 to 13, recode had a major overhaul and now does not support the macroman encoding. Its unclear if this is a bug or intentional. Regardless, use the CSMACINTOSH encoding instead as MacRoman and it are aliases and CSMACINTOSH is supported on both Debian 12 and 13. Signed-off-by: Glenn Washburn <development@efficientek.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 parent 9b2c8ae commit ee283b1

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

tests/util/grub-fs-tester.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,9 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
743743
dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((0x468)) conv=notrunc count=8
744744
MOUNTFS="hfsplus";;
745745
x"hfs")
746-
"mkfs.hfs" -b $BLKSIZE -v "`echo $FSLABEL |recode utf8..macroman`" -h "${MOUNTDEVICE}"
746+
# CSMACINTOSH is an alias for MacRoman which is the
747+
# encoding used on HFS.
748+
"mkfs.hfs" -b $BLKSIZE -v "`echo $FSLABEL | recode utf8..CSMACINTOSH`" -h "${MOUNTDEVICE}"
747749
dd if=/dev/urandom of="${MOUNTDEVICE}" bs=1 seek=$((0x474)) conv=notrunc count=8
748750
MOUNTOPTS="iocharset=utf8,codepage=macroman,"
749751
;;

0 commit comments

Comments
 (0)