[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] tests: Let xorriso fixely assume UTF-8 as local character set
From: |
Thomas Schmitt |
Subject: |
[PATCH] tests: Let xorriso fixely assume UTF-8 as local character set |
Date: |
Fri, 27 Aug 2021 23:05:06 +0200 |
iso9660_test fails if the effective locale is not UTF-8. This happens
because xorriso needs to convert file names and FSLABEL to UCS-2 when
preparing a Joliet tree. grub-fs-tester obviously intends to use UTF-8
as character set, but xorriso assumes by default the result of
nl_langinfo(3) with item CODESET.
So override the result of nl_langinfo(CODESET) by options of xorriso -as
mkisofs.
Signed-off-by: Thomas Schmitt <scdbackup@gmx.net>
---
tests/util/grub-fs-tester.in | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
index bfc425e1f..4f581b638 100644
--- a/tests/util/grub-fs-tester.in
+++ b/tests/util/grub-fs-tester.in
@@ -8,6 +8,10 @@ GRUBFSTEST="@builddir@/grub-fstest"
tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
+# xorriso -as mkisofs options to ignore locale when processing file names and
+# FSLABEL. This is especially needed for the conversion to Joliet UCS-2.
+XORRISOFS_CHARSET="-input-charset UTF-8 -output-charset UTF-8"
+
# This wrapper is to ease insertion of valgrind or time statistics
run_it () {
LC_ALL=C "$GRUBFSTEST" "$@"
@@ -1020,31 +1024,31 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE"
"$MAXLOGSECSIZE" 1); do
(cd "$MASTER"; find . | cpio -o -H "$(echo ${fs} | sed
's@^cpio_@@')" > "${FSIMAGEP}0.img" ) ;;
x"ziso9660")
FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
- xorriso -compliance rec_mtime -set_filter_r --zisofs --
-zisofs default -as mkisofs -iso-level 3 -graft-points -R -J -joliet-long -V
"$FSLABEL" --modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o
"${FSIMAGEP}0.img" -- -set_filter_r --zisofs -- -zisofs default -add
/="$MASTER" ;;
+ xorriso -compliance rec_mtime -set_filter_r --zisofs --
-zisofs default -as mkisofs $XORRISOFS_CHARSET -iso-level 3 -graft-points -R -J
-joliet-long -V "$FSLABEL" --modification-date=$(echo ${FSUUID} | sed
's/-//g;') -o "${FSIMAGEP}0.img" -- -set_filter_r --zisofs -- -zisofs default
-add /="$MASTER" ;;
x"iso9660")
FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
- xorriso --rockridge off -compliance rec_mtime -as mkisofs
-iso-level 3 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} |
sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER" ;;
+ xorriso --rockridge off -compliance rec_mtime -as mkisofs
$XORRISOFS_CHARSET -iso-level 3 -graft-points -V "$FSLABEL"
--modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"
/="$MASTER" ;;
x"joliet")
FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
- xorriso --rockridge off -compliance rec_mtime -as mkisofs
-iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL"
--modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"
/="$MASTER" ;;
+ xorriso --rockridge off -compliance rec_mtime -as mkisofs
$XORRISOFS_CHARSET -iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL"
--modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"
/="$MASTER" ;;
x"rockridge")
FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
- xorriso --rockridge on -compliance rec_mtime -as mkisofs
-iso-level 3 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} |
sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER" ;;
+ xorriso --rockridge on -compliance rec_mtime -as mkisofs
$XORRISOFS_CHARSET -iso-level 3 -graft-points -V "$FSLABEL"
--modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"
/="$MASTER" ;;
x"rockridge_joliet")
FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
- xorriso --rockridge on -compliance rec_mtime -as mkisofs
-iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL"
--modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"
/="$MASTER" ;;
+ xorriso --rockridge on -compliance rec_mtime -as mkisofs
$XORRISOFS_CHARSET -iso-level 3 -graft-points -J -joliet-long -V "$FSLABEL"
--modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"
/="$MASTER" ;;
x"iso9660_1999")
FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
- xorriso --rockridge off -compliance rec_mtime -as mkisofs
-iso-level 4 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} |
sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER" ;;
+ xorriso --rockridge off -compliance rec_mtime -as mkisofs
$XORRISOFS_CHARSET -iso-level 4 -graft-points -V "$FSLABEL"
--modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"
/="$MASTER" ;;
x"joliet_1999")
FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
- xorriso --rockridge off -compliance rec_mtime -as mkisofs
-iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL"
--modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"
/="$MASTER" ;;
+ xorriso --rockridge off -compliance rec_mtime -as mkisofs
$XORRISOFS_CHARSET -iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL"
--modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"
/="$MASTER" ;;
x"rockridge_1999")
FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
- xorriso --rockridge on -compliance rec_mtime -as mkisofs
-iso-level 4 -graft-points -V "$FSLABEL" --modification-date=$(echo ${FSUUID} |
sed 's/-//g;') -o "${FSIMAGEP}0.img" /="$MASTER" ;;
+ xorriso --rockridge on -compliance rec_mtime -as mkisofs
$XORRISOFS_CHARSET -iso-level 4 -graft-points -V "$FSLABEL"
--modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"
/="$MASTER" ;;
x"rockridge_joliet_1999")
FSUUID=$(date -u +%Y-%m-%d-%H-%M-%S-00);
- xorriso --rockridge on -compliance rec_mtime -as mkisofs
-iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL"
--modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"
/="$MASTER" ;;
+ xorriso --rockridge on -compliance rec_mtime -as mkisofs
$XORRISOFS_CHARSET -iso-level 4 -graft-points -J -joliet-long -V "$FSLABEL"
--modification-date=$(echo ${FSUUID} | sed 's/-//g;') -o "${FSIMAGEP}0.img"
/="$MASTER" ;;
x"romfs")
genromfs -V "$FSLABEL" -f "${FSIMAGEP}0.img" -d "$MASTER" ;;
xsquash4_*)
--
2.20.1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] tests: Let xorriso fixely assume UTF-8 as local character set,
Thomas Schmitt <=