From df83a7afedc65313a8db9f58b1474acd7d7be672 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sun, 3 Dec 2023 21:07:54 -0800 Subject: [PATCH] Set C.UTF-8 locale in /etc/default/locale for all images; originally intended to be landed in the cosmic cycle.. --- debian/changelog | 4 ++++ live-build/auto/build | 11 ++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12585019..edae5055 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ livecd-rootfs (24.04.7) UNRELEASED; urgency=medium [ Jean-Baptiste Lallement ] * Include -updates when calling germinate. LP: #1921862. + [ Steve Langasek ] + * Set C.UTF-8 locale in /etc/default/locale for all images; originally + intended to be landed in the cosmic cycle.. + -- Dave Jones Mon, 02 Oct 2023 15:46:06 +0100 livecd-rootfs (24.04.6) noble; urgency=medium diff --git a/live-build/auto/build b/live-build/auto/build index 787ac9ce..23b7bee8 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -165,15 +165,8 @@ Expire-Date: 0 lb bootstrap "$@" - case $PROJECT:${SUBPROJECT:-} in - ubuntu-server:*|ubuntu-cpc:*|ubuntu:desktop-preinstalled|ubuntu-wsl:*) - # Set locale to C.UTF-8 by default. We should - # probably do this for all images early in the - # 18.10 cycle but for now just do it for - # server and cpc products. - echo "LANG=C.UTF-8" > chroot/etc/default/locale - ;; - esac + # Set locale to C.UTF-8 by default. This may be overridden later. + echo "LANG=C.UTF-8" > chroot/etc/default/locale if [ "${SUBPROJECT:-}" = minimized ] \ && ! Chroot chroot dpkg -l tzdata 2>&1 |grep -q ^ii; then