ubuntu: Don't fail on invalid locale

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

ubuntu: Don't fail on invalid locale
3fefd6e6 · Stéphane Graber · 19668d8b · 3fefd6e6
Commit 3fefd6e6 authored Jan 15, 2014 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

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

No files found.
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -87,11 +87,11 @@ EOF
    # make sure we have the current locale defined in the container
    if [ -z "$LANG" ] || echo $LANG | grep -E -q "^C(\..+)*$"; then
-        chroot $rootfs locale-gen en_US.UTF-8
+        chroot $rootfs locale-gen en_US.UTF-8 || true
-        chroot $rootfs update-locale LANG=en_US.UTF-8
+        chroot $rootfs update-locale LANG=en_US.UTF-8 || true
    else
-        chroot $rootfs locale-gen $LANG
+        chroot $rootfs locale-gen $LANG || true
-        chroot $rootfs update-locale LANG=$LANG
+        chroot $rootfs update-locale LANG=$LANG || true
    fi
    # generate new SSH keys