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

Proposed by Robert C Jennings on 2017-08-30
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2017-08-31
Approved revision: no longer in the source branch.
Merged at revision: 732
Proposed branch: lp:~rcj/vmbuilder/automated-ec2-builds
Merge into: lp:~ubuntu-on-ec2/vmbuilder/automated-ec2-builds
Diff against target: 25 lines (+0/-8)
1 file modified
ovf/part2disk-grubhelper.uefi (+0/-8)
To merge this branch: bzr merge lp:~rcj/vmbuilder/automated-ec2-builds
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2017-08-30 Approve on 2017-08-31
Francis Ginther 2017-08-30 Approve on 2017-08-30
Chris Glass Pending
Review via email: mp+329963@code.launchpad.net
To post a comment you must log in.
Francis Ginther (fginther) wrote :

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

review: Approve
Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks good.

review: Approve
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]

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ovf/part2disk-grubhelper.uefi'
2--- ovf/part2disk-grubhelper.uefi 2015-02-25 23:24:44 +0000
3+++ ovf/part2disk-grubhelper.uefi 2017-08-30 20:20:44 +0000
4@@ -223,9 +223,6 @@
5 xchroot apt-get -y update
6
7 # Install the UEFI bits
8-xchroot cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed \
9- /boot/efi/EFI/BOOT/grubx64.efi
10-
11 BOOT_D="/boot/efi/EFI/BOOT"
12
13 # Make sure these modules are always pre-loaded
14@@ -238,11 +235,6 @@
15
16 EOF
17
18-
19-xchroot cp /usr/lib/shim/shim.efi.signed ${BOOT_D}/shimx64.efi
20-xchroot cp /usr/lib/shim/MokManager.efi.signed ${BOOT_D}/MokManager.efi
21-xchroot cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed ${BOOT_D}/grubx64.efi
22-
23 xchroot grub-install /dev/${bn_lodev} \
24 --boot-directory=/boot \
25 --efi-directory=/boot/efi \

Subscribers

People subscribed via source and target branches