From 18c8049a23f9ec717207cdb880532ad191c47146 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 9 May 2018 09:37:18 +1200 Subject: [PATCH 1/5] 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..9cfbb0a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.408.39) 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..ac8b39ce 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 + # 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 From e8a9bb58ab3f0a92093697c8b1bfe1abfcb9127a Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 9 May 2018 10:04:05 +1200 Subject: [PATCH 2/5] fix version number --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9cfbb0a5..eedb5b96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.408.39) xenial; urgency=medium +livecd-rootfs (2.408.30) xenial; urgency=medium * Set the default locale to C.UTF-8 in minimized cloud images. (LP: #1759003) From 0c41250141d5892bbb458fbfa1497dd65a9d2595 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 9 May 2018 10:09:03 +1200 Subject: [PATCH 3/5] add a word --- live-build/auto/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/build b/live-build/auto/build index ac8b39ce..88644216 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -37,7 +37,7 @@ Expire-Date: 0 # 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 - # locale-gen so a change is more urgent. + # lack locale-gen so a change is more urgent. echo "LANG=C.UTF-8" > chroot/etc/default/locale fi ;; From 4fe56fe700736b3ad658465a9deff07dccb49460 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 9 May 2018 10:20:49 +1200 Subject: [PATCH 4/5] prefer tabs for indentation --- live-build/auto/build | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index 88644216..fb1c3947 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -31,17 +31,17 @@ 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 + 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 From c482ce867f85de804825d0b350edcb7b601416d2 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 9 May 2018 10:22:03 +1200 Subject: [PATCH 5/5] mark UNRELEASED --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eedb5b96..6391f184 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.408.30) xenial; urgency=medium +livecd-rootfs (2.408.30) UNRELEASED; urgency=medium * Set the default locale to C.UTF-8 in minimized cloud images. (LP: #1759003)