livecd-rootfs

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

  1. zesty_grub
  2. Merge into trunk
Proposed by Robert C Jennings
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 1449
Merged at revision: 1449
Proposed branch: lp:~rcj/livecd-rootfs/zesty_grub
Merge into: lp:livecd-rootfs
Diff against target: 13 lines (+0/-3)
1 file modified
live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary (+0/-3)
To merge this branch: bzr merge lp:~rcj/livecd-rootfs/zesty_grub
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+309517@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary'
2--- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary 2016-02-06 08:34:16 +0000
3+++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary 2016-10-28 20:15:40 +0000
4@@ -70,9 +70,6 @@
5 amd64)
6 chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed
7 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"
8- chroot mountpoint cp /usr/lib/shim/shim.efi.signed "${efi_boot_dir}/shimx64.efi"
9- chroot mountpoint cp /usr/lib/shim/MokManager.efi.signed "${efi_boot_dir}/MokManager.efi"
10- chroot mountpoint cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed "${efi_boot_dir}/grubx64.efi"
11 efi_target=x86_64-efi
12 ;;
13 esac

Subscribers

People subscribed via source and target branches