From 8aadf2c73d03785922eb7e2c110f8e2d5060448d Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Wed, 16 Aug 2017 16:32:27 -0700
Subject: [PATCH] Set a default locale of C.UTF-8 in the cloud images.

---
 debian/changelog                                 | 4 ++++
 live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 59e4e416..bbcd11ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 livecd-rootfs (2.449) UNRELEASED; urgency=medium
 
+  [ Balint Reczey ]
   * Use VMDKstream in a more future-proof way
 
+  [ Steve Langasek ]
+  * Set a default locale of C.UTF-8 in the cloud images.
+
  -- Balint Reczey <rbalint@ubuntu.com>  Mon, 24 Jul 2017 20:39:35 +0200
 
 livecd-rootfs (2.448) artful; urgency=medium
diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
index cf6b6bdb..fb3113bc 100755
--- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
+++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
@@ -89,6 +89,12 @@ _xchroot "${rootd}" sh -c 'rm -f /etc/ssh/ssh_host_[rd]sa_key*'
 ## --------------
 _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.
+echo LANG="C.UTF-8" > "${rootd}/etc/default/locale"
+
 ## --------------
 # set cloud-init to be on
 values="NoCloud, ConfigDrive, AltCloud, OVF, MAAS, Ec2, None"