ubuntu: Don't break when the locale is C.*

Update the code to also match C.* so that C.UTF-8 doesn't make the container creation fail. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

ubuntu: Don't break when the locale is C.*
dc7f6545 · Stéphane Graber · 0a9362f5 · dc7f6545
Unverified Commit dc7f6545 authored Apr 24, 2013 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

lxc-ubuntu.in templates/lxc-ubuntu.in +3 -5

No files found.
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -81,14 +81,12 @@ EOF
    fi

    # make sure we have the current locale defined in the container
-    if [ -z "$LANG" ]; then
+    if [ -z "$LANG" ] || echo $LANG | grep -E -q "^C(\..+)*$"; then
        chroot $rootfs locale-gen en_US.UTF-8
        chroot $rootfs update-locale LANG=en_US.UTF-8
    else
-        if [ "$LANG" != "C" ]; then
-            chroot $rootfs locale-gen $LANG
-            chroot $rootfs update-locale LANG=$LANG
-        fi
+        chroot $rootfs locale-gen $LANG
+        chroot $rootfs update-locale LANG=$LANG
    fi

    # generate new SSH keys