From 18f823c1ca9f750ebad23f45026fcdeddc57a389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Wed, 28 Nov 2012 18:29:55 -0500 Subject: [PATCH] lxc-ubuntu: Always create the needed locales MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move some old code from the trim() function into the main configure_ubuntu function so that we always create a locale in the container. Signed-off-by: Stéphane Graber Acked-by: Serge E. Hallyn --- templates/lxc-ubuntu.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in index 90021fa8e..c9d464987 100644 --- a/templates/lxc-ubuntu.in +++ b/templates/lxc-ubuntu.in @@ -80,6 +80,15 @@ EOF echo "ubuntu:ubuntu" | chroot $rootfs chpasswd fi + # make sure we have the current locale defined in the container + if [ -z "$LANG" ]; then + 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 + fi + return 0 } @@ -431,15 +440,6 @@ EOF # /lib/init/fstab: cleared out for bare-bones lxc EOF - # reconfigure some services - if [ -z "$LANG" ]; then - 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 - fi - # remove pointless services in a container chroot $rootfs /usr/sbin/update-rc.d -f ondemand remove