Merge lp:~mwhudson/livecd-rootfs/default-LANG-C.UTF-8 into lp:livecd-rootfs

Proposed by Michael Hudson-Doyle on 2018-03-26
Status: Merged
Merged at revision: 1647
Proposed branch: lp:~mwhudson/livecd-rootfs/default-LANG-C.UTF-8
Merge into: lp:livecd-rootfs
Diff against target: 35 lines (+17/-0)
2 files modified
debian/changelog (+7/-0)
live-build/auto/build (+10/-0)
To merge this branch: bzr merge lp:~mwhudson/livecd-rootfs/default-LANG-C.UTF-8
Reviewer Review Type Date Requested Status
Steve Langasek 2018-03-26 Approve on 2018-03-26
Review via email: mp+342144@code.launchpad.net

Description of the change

This needs careful testing. I can test the ubuntu server (subiquity and d-i) bits, not completely sure what is required to test the cpc bits though.

To post a comment you must log in.
Steve Langasek (vorlon) wrote :

+1.

Testing the cpc bits should be a matter of ensuring that a cloud image boots by default with no noise about locale-gen in the cloud-init logs and still ends up with /etc/default/locale set to C.UTF-8 after boot; and also to test in at least one cloud with cloud data overrides to set the locale to something else. (And anyway, if either of these tests fails, it needs fixing in cloud-init at that point.)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2018-03-21 11:05:46 +0000
+++ debian/changelog 2018-03-26 20:51:08 +0000
@@ -1,3 +1,10 @@
1livecd-rootfs (2.515) UNRELEASED; urgency=medium
2
3 * Set the default locale to C.UTF-8 in all server and cloud images.
4 (LP: #1751051, #1759003)
5
6 -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Tue, 27 Mar 2018 09:41:59 +1300
7
1livecd-rootfs (2.514) bionic; urgency=medium8livecd-rootfs (2.514) bionic; urgency=medium
29
3 * On amd64, if building minimal images for bionic, xenial, or extra ppa,10 * On amd64, if building minimal images for bionic, xenial, or extra ppa,
411
=== modified file 'live-build/auto/build'
--- live-build/auto/build 2018-03-06 09:15:00 +0000
+++ live-build/auto/build 2018-03-26 20:51:08 +0000
@@ -94,6 +94,16 @@
9494
95 lb bootstrap "$@"95 lb bootstrap "$@"
9696
97 case $PROJECT in
98 ubuntu-server|ubuntu-cpc)
99 # Set locale to C.UTF-8 by default. We should
100 # probably do this for all images early in the
101 # 18.10 cycle but for now just do it for
102 # server and cpc products.
103 echo "LANG=C.UTF-8" > chroot/etc/default/locale
104 ;;
105 esac
106
97 if [ "${SUBPROJECT:-}" = minimized ] \107 if [ "${SUBPROJECT:-}" = minimized ] \
98 && ! Chroot chroot dpkg -l tzdata 2>&1 |grep -q ^ii; then108 && ! Chroot chroot dpkg -l tzdata 2>&1 |grep -q ^ii; then
99 # workaround for tzdata purge not removing these files109 # workaround for tzdata purge not removing these files

Subscribers

People subscribed via source and target branches