From 4b05414c19d40a94b794922e67907176e70073d7 Mon Sep 17 00:00:00 2001 From: Igor Velkov Date: Sat, 4 Jun 2022 12:29:25 +0300 Subject: [PATCH] Fix 'cannot change locale (en_US.UTF-8)' warning #3850 (#3851) --- lib/debootstrap.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/debootstrap.sh b/lib/debootstrap.sh index b295f219a6..708924b818 100644 --- a/lib/debootstrap.sh +++ b/lib/debootstrap.sh @@ -254,6 +254,8 @@ create_rootfs_cache() display_alert "Configuring locales" "$DEST_LANG" "info" [[ -f $SDCARD/etc/locale.gen ]] && sed -i "s/^# $DEST_LANG/$DEST_LANG/" $SDCARD/etc/locale.gen + eval 'LC_ALL=C LANG=C chroot $SDCARD /bin/bash -c "locale-gen C.UTF-8"' ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} + eval 'LC_ALL=C LANG=C chroot $SDCARD /bin/bash -c "locale-gen en_US.UTF-8"' ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} eval 'LC_ALL=C LANG=C chroot $SDCARD /bin/bash -c "locale-gen $DEST_LANG"' ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} eval 'LC_ALL=C LANG=C chroot $SDCARD /bin/bash -c "update-locale LANG=$DEST_LANG LANGUAGE=$DEST_LANG LC_MESSAGES=$DEST_LANG"' \ ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} @@ -736,7 +738,7 @@ PREPARE_IMAGE_SIZE fi # recompile .cmd to .scr if boot.cmd exists - + if [[ -f $SDCARD/boot/boot.cmd ]]; then if [ -z $BOOTSCRIPT_OUTPUT ]; then BOOTSCRIPT_OUTPUT=boot.scr; fi mkimage -C none -A arm -T script -d $SDCARD/boot/boot.cmd $SDCARD/boot/$BOOTSCRIPT_OUTPUT > /dev/null 2>&1