From 837997ea02f884b2732ea0270efd14b6ee03e3a8 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>
Date: Fri, 28 Oct 2016 21:49:42 -0400
Subject: [PATCH] Import patches-unapplied version 2.436 to
ubuntu/zesty-proposed
Imported using git-ubuntu import.
Changelog parent: b477837c3120d904a5fd724a12e55e0b153826f5
New changelog entries:
[ Robert C Jennings ]
* ubuntu-cpc: Remove redundant copy of grub files.
---
debian/changelog | 7 +++++++
live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary | 3 ---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d7e050fd..f7d01d47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.436) zesty; urgency=medium
+
+ [ Robert C Jennings ]
+ * ubuntu-cpc: Remove redundant copy of grub files.
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Fri, 28 Oct 2016 21:49:42 -0400
+
livecd-rootfs (2.435) yakkety; urgency=medium
* Update the ubuntu-touch hints to try installing ubuntu-system-settings
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 8599ea8d..bcce19d7 100755
--- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
@@ -70,9 +70,6 @@ install_grub() {
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"
- chroot mountpoint cp /usr/lib/shim/shim.efi.signed "${efi_boot_dir}/shimx64.efi"
- chroot mountpoint cp /usr/lib/shim/MokManager.efi.signed "${efi_boot_dir}/MokManager.efi"
- chroot mountpoint cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed "${efi_boot_dir}/grubx64.efi"
efi_target=x86_64-efi
;;
esac