Merge lp:~rcj/vmbuilder/automated-ec2-builds into lp:~ubuntu-on-ec2/vmbuilder/automated-ec2-builds

[Robert C Jennings]

[Francis Ginther (fginther)]

This looks correct based on the explanation and the IRC discussion.

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good.

review: Approve

[lp:~rcj/vmbuilder/automated-ec2-builds]

732. By Robert C Jennings on 2017-08-31

grub-efi: Remove unnecessary (and incorrect) file copy operations

grub EFI files were renamed, which has broken the copy operations.
These are unnecessary as the grub-install will perform all of the
needed file copies.

MP: https://code.launchpad.net/~rcj/vmbuilder/automated-ec2-builds/+merge/329963
[a=rcj][r=cyphermox,fginther]

=== modified file 'ovf/part2disk-grubhelper.uefi'
--- ovf/part2disk-grubhelper.uefi	2015-02-25 23:24:44 +0000
+++ ovf/part2disk-grubhelper.uefi	2017-08-30 20:20:44 +0000
@@ -223,9 +223,6 @@
 xchroot apt-get -y update
 
 # Install the UEFI bits
-xchroot cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed \
-		/boot/efi/EFI/BOOT/grubx64.efi
-
 BOOT_D="/boot/efi/EFI/BOOT"
 
 # Make sure these modules are always pre-loaded
@@ -238,11 +235,6 @@
 
 EOF
 
-
-xchroot cp /usr/lib/shim/shim.efi.signed ${BOOT_D}/shimx64.efi
-xchroot cp /usr/lib/shim/MokManager.efi.signed ${BOOT_D}/MokManager.efi
-xchroot cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed ${BOOT_D}/grubx64.efi
-
 xchroot grub-install /dev/${bn_lodev} \
 	--boot-directory=/boot \
 	--efi-directory=/boot/efi \