From: Dwight Engen <dwight.engen@oracle.com>
Date: Wed, 3 Apr 2013 18:43:15 +0000 (-0400)
Subject: ubuntu template: fix installation when LANG=C
X-Git-Tag: lxc-1.0.0.alpha1~1^2~317
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75129865d48d2293383316f88ce7661e37dde43d;p=thirdparty%2Flxc.git

ubuntu template: fix installation when LANG=C

The ubuntu template will silently fail (because it is set -e) on
the locale-gen command when LANG=C

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index f01163326..db38af063 100644
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -85,8 +85,10 @@ EOF
         chroot $rootfs locale-gen en_US.UTF-8
         chroot $rootfs update-locale LANG=en_US.UTF-8
     else
-        chroot $rootfs locale-gen $LANG
-        chroot $rootfs update-locale LANG=$LANG
+        if [ "$LANG" != "C" ]; then
+            chroot $rootfs locale-gen $LANG
+            chroot $rootfs update-locale LANG=$LANG
+        fi
     fi
 
     return 0