diff --git a/debian/changelog b/debian/changelog index eb263687..dd8be2f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (24.04.10) UNRELEASED; urgency=medium + + * Set C.UTF-8 locale in /etc/default/locale for all images; originally + intended to be landed in the cosmic cycle.. + + -- Steve Langasek Thu, 07 Dec 2023 21:21:17 -0800 + livecd-rootfs (24.04.9) noble; urgency=medium * When building locally using the auto/build script unmounting fails. 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