Merge lp:~rcj/livecd-rootfs/zesty_grub into lp:livecd-rootfs

[Robert C Jennings]

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good to me.

Note however that as discussed, settings grub_modules is useless; the EFI images are pre-made with specific modules -- you couldn't have them signed for the Secure Boot case otherwise, so that part too is something that could be removed.

review: Approve

=== modified file 'live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary'
--- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2016-02-06 08:34:16 +0000
+++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2016-10-28 20:15:40 +0000
@@ -70,9 +70,6 @@
         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