Merge ~philroche/maas-images:feature/shim-signed-rename into maas-images:master

Proposed by Philip Roche
Status: Merged
Approved by: Adam Collard
Approved revision: 12029e75c2a5402bd0e7cd32c68583c8edb05f6a
Merged at revision: 12029e75c2a5402bd0e7cd32c68583c8edb05f6a
Proposed branch: ~philroche/maas-images:feature/shim-signed-rename
Merge into: maas-images:master
Diff against target: 22 lines (+2/-2)
1 file modified
conf/bootloaders.yaml (+2/-2)
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
Review via email: mp+441575@code.launchpad.net

Commit message

Fix: Migrate to shimx64.efi.signed.latest and shimaa64.efi.signed.latest for shim

Following a rename of the shimx64.efi.signed files to shimx64.efi.signed.latest and
shimx64.efi.signed.previous we need to migrate the new `.latest` file instead.

This fixes the build issue when creating bootloader stream.

```
13:05:31 FileNotFoundError: [Errno 2] No such file or directory: '/tmp/maas-images-onnhjghf/usr/lib/shim/shimx64.efi.signed'
13:05:32 Failed to import the bootloaders
```

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) wrote :

+1, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/conf/bootloaders.yaml b/conf/bootloaders.yaml
index 619ed5d..d7d2a67 100644
--- a/conf/bootloaders.yaml
+++ b/conf/bootloaders.yaml
@@ -29,7 +29,7 @@ bootloaders:
29 release: focal29 release: focal
30 os: grub-efi-signed30 os: grub-efi-signed
31 files:31 files:
32 - usr/lib/shim/shimx64.efi.signed, bootx64.efi32 - usr/lib/shim/shimx64.efi.signed.latest, bootx64.efi
33 - usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed, grubx64.efi33 - usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed, grubx64.efi
34 - firmware-platform: uefi34 - firmware-platform: uefi
35 packages:35 packages:
@@ -41,7 +41,7 @@ bootloaders:
41 release: focal41 release: focal
42 os: grub-efi42 os: grub-efi
43 files:43 files:
44 - usr/lib/shim/shimaa64.efi.signed, bootaa64.efi44 - usr/lib/shim/shimaa64.efi.signed.latest, bootaa64.efi
45 - usr/lib/grub/arm64-efi-signed/grubnetaa64.efi.signed, grubaa64.efi45 - usr/lib/grub/arm64-efi-signed/grubnetaa64.efi.signed, grubaa64.efi
46 - firmware-platform: open-firmware46 - firmware-platform: open-firmware
47 packages:47 packages:

Subscribers

People subscribed via source and target branches