From 1c92ed0ab60f61ce59b718d5b05a31b8d1f6d0e7 Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Tue, 8 May 2018 11:32:29 -0500 Subject: [PATCH] Import patches-unapplied version 2.408.30 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: fac71039c0b1cc685c4f8459db7899515214acef New changelog entries: * Set the default locale to C.UTF-8 in minimized cloud images. (LP: #1759003) --- debian/changelog | 7 +++++++ live-build/auto/build | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/debian/changelog b/debian/changelog index 39a2c6a1..eedb5b96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.408.30) xenial; urgency=medium + + * Set the default locale to C.UTF-8 in minimized cloud images. + (LP: #1759003) + + -- Robert C Jennings Tue, 08 May 2018 11:32:29 -0500 + livecd-rootfs (2.408.29) xenial; urgency=medium [ Christopher Glass ] diff --git a/live-build/auto/build b/live-build/auto/build index 0f617b56..fb1c3947 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -31,6 +31,18 @@ Expire-Date: 0 lb bootstrap "$@" + case $PROJECT in + ubuntu-cpc) + if [ "${SUBPROJECT:-}" = minimized ] ; then + # Set locale to C.UTF-8 by default for minimized + # images. We can do this for all ubuntu-cpc images + # after further testing, however minimized images + # lack locale-gen so a change is more urgent. + echo "LANG=C.UTF-8" > chroot/etc/default/locale + fi + ;; + esac + if [ "${SUBPROJECT:-}" = minimized ] \ && ! Chroot chroot dpkg -l tzdata 2>&1 |grep -q ^ii; then # workaround for tzdata purge not removing these files