From d50b3ba5296f34337eddf9551659279848f556fd Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 23 Mar 2017 14:40:47 -0400 Subject: [PATCH] ubuntu-cpc: Remove redundant copy of grub files. (LP: #1637290) --- debian/changelog | 7 +++++-- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1ab81108..c85851d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.408.9) xenial; urgency=medium +livecd-rootfs (2.408.9) UNRELEASED; urgency=medium [ Daniel Watkins ] * Don't overwrite the default sources.list in cloud images. @@ -16,7 +16,10 @@ livecd-rootfs (2.408.9) xenial; urgency=medium * Add replace_grub_root_with_label function thereby consolidating multiple uses of the same calls to sed. - -- Robert C Jennings Fri, 17 Mar 2017 13:15:49 -0500 + [ Robert C Jennings ] + * ubuntu-cpc: Remove redundant copy of grub files. (LP: #1637290) + + -- Robert C Jennings Thu, 23 Mar 2017 14:39:38 -0400 livecd-rootfs (2.408.8) xenial; urgency=medium 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 714c1a35..04a3c7df 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