mirror of
https://github.com/lxc/lxc-templates.git
synced 2025-02-25 19:13:43 +00:00
Merge pull request #29 from P-EB/master
[lxc-debian] Handle languages that are only UTF-8 encoded
This commit is contained in:
commit
f26370b875
@ -129,7 +129,8 @@ EOF
|
|||||||
chroot "$rootfs" locale-gen en_US.UTF-8 UTF-8
|
chroot "$rootfs" locale-gen en_US.UTF-8 UTF-8
|
||||||
chroot "$rootfs" update-locale LANG=en_US.UTF-8
|
chroot "$rootfs" update-locale LANG=en_US.UTF-8
|
||||||
else
|
else
|
||||||
encoding=$(echo "$LANG" | cut -d. -f2)
|
encoding=$(locale charmap)
|
||||||
|
[ -z "${encoding}" ] && encoding="UTF-8"
|
||||||
chroot "$rootfs" sed -e "s/^# \(${LANG} ${encoding}\)/\1/" \
|
chroot "$rootfs" sed -e "s/^# \(${LANG} ${encoding}\)/\1/" \
|
||||||
-i /etc/locale.gen 2> /dev/null
|
-i /etc/locale.gen 2> /dev/null
|
||||||
cat >> "$rootfs/etc/locale.gen" << EOF
|
cat >> "$rootfs/etc/locale.gen" << EOF
|
||||||
|
Loading…
Reference in New Issue
Block a user