Merge lp:~vorlon/livecd-rootfs/locale into lp:livecd-rootfs

Proposed by Steve Langasek
Status: Merged
Merged at revision: 1493
Proposed branch: lp:~vorlon/livecd-rootfs/locale
Merge into: lp:livecd-rootfs
Diff against target: 32 lines (+10/-0)
2 files modified
debian/changelog (+4/-0)
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot (+6/-0)
To merge this branch: bzr merge lp:~vorlon/livecd-rootfs/locale
Reviewer Review Type Date Requested Status
Adam Conrad (community) Approve
Review via email: mp+329158@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Adam Conrad (adconrad) wrote :

I was going to ask why you're not using update-locale to mangle the file, then realised that's not possible due to you building images without locales installed. So, +1 from me.

review: Approve
Revision history for this message
Ryan Harper (raharper) wrote :

Question about Xenial (and I supppose Zesty as well).

Revision history for this message
Steve Langasek (vorlon) wrote :

On Fri, Aug 18, 2017 at 06:03:41PM -0000, Ryan Harper wrote:
> Question about Xenial (and I supppose Zesty as well).

> Diff comments:

> > === modified file 'live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot'
> > --- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot 2016-04-14 18:06:33 +0000
> > +++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot 2017-08-16 23:33:27 +0000
> > @@ -90,6 +90,12 @@
> > _xchroot "${rootd}" locale-gen en_US.utf8
> >
> > ## --------------
> > +# We continue to pre-generate en_US.UTF-8 locale above, but the default locale
> > +# should be C.UTF-8 for 17.10 and later. For earlier releases, cloud-init may
> > +# override this.

> Is it possible, for say Xenial, which currently includes a locale-archive
> with en_US.UTF-8 already present, to have /etc/default/locale set to that?
> This would ensure that we don't change the default LANG on Xenial and
> benefit from the presence of the pre-generated en_US.UTF-8 locale?

It is possible for us to use a different value for stable releases; each
release uses the corresponding livecd-rootfs from that release, so whatever
we SRU into those releases is what will be seen here.

What is the behavior of cloud-init if /etc/default/locale is set to C.UTF-8,
the en_US.UTF-8 locale is pre-generated, and cloud-init wants to use
en_US.UTF-8 for the given release? I would expect cloud-init to be able to
avoid regeneration of the locale in this case.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-07-24 18:46:51 +0000
3+++ debian/changelog 2017-08-16 23:33:27 +0000
4@@ -1,7 +1,11 @@
5 livecd-rootfs (2.449) UNRELEASED; urgency=medium
6
7+ [ Balint Reczey ]
8 * Use VMDKstream in a more future-proof way
9
10+ [ Steve Langasek ]
11+ * Set a default locale of C.UTF-8 in the cloud images.
12+
13 -- Balint Reczey <rbalint@ubuntu.com> Mon, 24 Jul 2017 20:39:35 +0200
14
15 livecd-rootfs (2.448) artful; urgency=medium
16
17=== modified file 'live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot'
18--- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot 2016-04-14 18:06:33 +0000
19+++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot 2017-08-16 23:33:27 +0000
20@@ -90,6 +90,12 @@
21 _xchroot "${rootd}" locale-gen en_US.utf8
22
23 ## --------------
24+# We continue to pre-generate en_US.UTF-8 locale above, but the default locale
25+# should be C.UTF-8 for 17.10 and later. For earlier releases, cloud-init may
26+# override this.
27+echo LANG="C.UTF-8" > "${rootd}/etc/default/locale"
28+
29+## --------------
30 # set cloud-init to be on
31 values="NoCloud, ConfigDrive, AltCloud, OVF, MAAS, Ec2, None"
32 printf "%s\t%s\t%s\t%s\n" \

Subscribers

People subscribed via source and target branches