From 8eadac557b6f5f0b23b7c109a659f9649884e8e9 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@ubuntu.com>
Date: Wed, 23 Aug 2017 17:27:53 -0700
Subject: [PATCH] Import patches-unapplied version 2.450 to
 ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 2003d73b1d0bb5ae1cf6f2511db65c0cc14c7b85

New changelog entries:
  [ Steve Langasek ]
  * Set a default locale of C.UTF-8 in the cloud images.
  [ Mathieu Trudel-Lapierre ]
  * Drop special handling of grub modules.  Modules should be included in
    the signed grub binaries when necessary.
---
 debian/changelog                                      | 11 +++++++++++
 .../ubuntu-cpc/hooks/033-disk-image-uefi.binary       | 11 ++++-------
 live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot      |  6 ++++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 88a339ee..01da23f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+livecd-rootfs (2.450) artful; urgency=medium
+
+  [ Steve Langasek ]
+  * Set a default locale of C.UTF-8 in the cloud images.
+
+  [ Mathieu Trudel-Lapierre ]
+  * Drop special handling of grub modules.  Modules should be included in
+    the signed grub binaries when necessary.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 23 Aug 2017 17:27:53 -0700
+
 livecd-rootfs (2.449) artful; urgency=medium
 
   [ Balint Reczey ]
diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
index 3ceb7cd0..33a19316 100755
--- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
@@ -62,24 +62,21 @@ install_grub() {
     efi_boot_dir="/boot/efi/EFI/BOOT"
     chroot mountpoint mkdir -p "${efi_boot_dir}"
 
+    # UEFI GRUB modules are meant to be used equally by Secure Boot and
+    # non-Secure Boot systems. If you need an extra module not already
+    # provided or run into "Secure Boot policy forbids loading X" problems,
+    # please file a bug against grub2 to include the affected module.
     case $ARCH in
         arm64)
             chroot mountpoint apt-get -qqy install --no-install-recommends grub-efi-arm64 grub-efi-arm64-bin
-            grub_modules="part_gpt fat gzio ext2 normal chain boot configfile linux search_fs_uuid search_label terminal serial video video_fb efi_gop"
             efi_target=arm64-efi
             ;;
         amd64)
             chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed
-            grub_modules="part_gpt fat ext2 normal chain boot configfile linux multiboot search_fs_uuid search_label terminal serial video video_fb video_bochs usb usb_keyboard efi_gop efi_uga"
             efi_target=x86_64-efi
             ;;
     esac
 
-    cat << EOF >> mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg
-${IMAGE_STR}
-# For Cloud Image compatability
-GRUB_PRELOAD_MODULES="${grub_modules}"
-EOF
     chroot mountpoint grub-install "${loop_device}" \
         --boot-directory=/boot \
         --efi-directory=/boot/efi \
diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
index fe11fd5e..633f8d66 100755
--- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
+++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
@@ -59,6 +59,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"