From: 有张纸 <fanyeren@gmail.com>
Date: Fri, 22 May 2015 13:26:35 +0000 (+0800)
Subject: Update lxc-debian.in
X-Git-Tag: lxc-1.1.3~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f642124d0d762a80c11a872ca4aa10ca389005e;p=thirdparty%2Flxc.git

Update lxc-debian.in

fix "bash: warning: setlocale: LC_ALL: cannot change locale"

Signed-off-by: <feng xiahou xiahoufeng@yahoo.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index 936b3645a..29d4d448d 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -97,12 +97,18 @@ EOF
 
     # reconfigure some services
     if [ -z "$LANG" ]; then
+        cat >> $rootfs/etc/locale.gen << EOF
+en_US.UTF-8 UTF-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)
         chroot $rootfs sed -e "s/^# \(${LANG} ${encoding}\)/\1/" \
             -i /etc/locale.gen 2> /dev/null
+        cat >> $rootfs/etc/locale.gen << EOF
+$LANG $encoding
+EOF
         chroot $rootfs locale-gen $LANG $encoding
         chroot $rootfs update-locale LANG=$LANG
     fi