MAAS

Merge lp:~newell-jensen/maas/1.9-fix-1582070 into lp:maas/1.9

  1. 1.9-fix-1582070
  2. Merge into 1.9
Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: no longer in the source branch.
Merged at revision: 4589
Proposed branch: lp:~newell-jensen/maas/1.9-fix-1582070
Merge into: lp:maas/1.9
Diff against target: 12 lines (+2/-2)
1 file modified
etc/maas/templates/uefi/config.local.arm64.template (+2/-2)
To merge this branch: bzr merge lp:~newell-jensen/maas/1.9-fix-1582070
Reviewer Review Type Date Requested Status
Newell Jensen (community) Approve
Review via email: mp+299332@code.launchpad.net

Commit message

Backport trunk r5151: This branch updates the UEFI ARM64 local boot config to chainload the locally installed EFI binary. This corrects the issue when booting a deployed system which has a USB stick plugged in that has its own grub.cfg.

To post a comment you must log in.
Revision history for this message
Newell Jensen (newell-jensen) wrote :

Self approve backport.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/maas/templates/uefi/config.local.arm64.template'
2--- etc/maas/templates/uefi/config.local.arm64.template 2015-06-11 21:05:48 +0000
3+++ etc/maas/templates/uefi/config.local.arm64.template 2016-07-06 16:50:20 +0000
4@@ -3,6 +3,6 @@
5
6 menuentry 'Local' {
7 echo 'Booting local disk...'
8- search --set=root --file /boot/grub/grub.cfg
9- configfile /boot/grub/grub.cfg
10+ search --set=root --file /efi/ubuntu/grubaa64.efi
11+ chainloader /efi/ubuntu/grubaa64.efi
12 }

Subscribers

People subscribed via source and target branches