From e370cacc6c0504f94391303820732a0e3bf77887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org> Date: Fri, 20 Mar 2020 11:43:02 +0100 Subject: [PATCH] [lxc-debian] Handle languages that are only UTF-8 encoded MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pierre-Elliott Bécue <becue@crans.org> --- templates/lxc-debian.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in index fd26d5e..7c8acfc 100644 --- a/templates/lxc-debian.in +++ b/templates/lxc-debian.in @@ -129,7 +129,8 @@ EOF chroot "$rootfs" locale-gen en_US.UTF-8 UTF-8 chroot "$rootfs" update-locale LANG=en_US.UTF-8 else - encoding=$(echo "$LANG" | cut -d. -f2) + encoding=$(locale charmap) + [ -z "${encoding}" ] && encoding="UTF-8" chroot "$rootfs" sed -e "s/^# \(${LANG} ${encoding}\)/\1/" \ -i /etc/locale.gen 2> /dev/null cat >> "$rootfs/etc/locale.gen" << EOF