From: Laurent Vallar <val@zbla.net>
Date: Wed, 16 Oct 2013 16:04:15 +0000 (+0200)
Subject: lxc-debian: Force locales generation
X-Git-Tag: lxc-1.0.0.alpha2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90ccc878deddcb2ec31d9caa0686a666267acafe;p=thirdparty%2Flxc.git

lxc-debian: Force locales generation

Signed-off-by: Laurent Vallar <val@zbla.net>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index 915afa414..d0a16773b 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -80,7 +80,10 @@ EOF
         chroot $rootfs locale-gen en_US.UTF-8 UTF-8
         chroot $rootfs update-locale LANG=en_US.UTF-8
     else
-        chroot $rootfs locale-gen $LANG $(echo $LANG | cut -d. -f2)
+        encoding=$(echo $LANG | cut -d. -f2)
+        chroot $rootfs perl -pe "s/^# (${LANG} ${encoding})/\1/" \
+            -i /etc/locale.gen 2>/dev/null
+        chroot $rootfs locale-gen $LANG $encoding
         chroot $rootfs update-locale LANG=$LANG
     fi