lxc-ubuntu: Always create the needed locales

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 <stgraber@ubuntu.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

lxc-ubuntu: Always create the needed locales
18f823c1 · Stéphane Graber · e62fa3f9 · 18f823c1
Commit 18f823c1 authored Nov 28, 2012 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

lxc-ubuntu.in templates/lxc-ubuntu.in +9 -9

No files found.
--- 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