Merge ~andreserl/maas:lp1740925_fix_centos_efi_2.3 into maas:2.3

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 99ef0b97eab81f427a0a63fc409d22bfe0771e71
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:lp1740925_fix_centos_efi_2.3
Merge into: maas:2.3
Diff against target: 17 lines (+6/-0)
1 file modified
src/provisioningserver/templates/uefi/config.local.amd64.template (+6/-0)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+345401@code.launchpad.net

Commit message

LP: #1740925 - Correctly set the bootloader for centos on EFI localboot

Backport f789b68 from master

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/templates/uefi/config.local.amd64.template b/src/provisioningserver/templates/uefi/config.local.amd64.template
2index 42e39eb..438cb8c 100644
3--- a/src/provisioningserver/templates/uefi/config.local.amd64.template
4+++ b/src/provisioningserver/templates/uefi/config.local.amd64.template
5@@ -6,6 +6,12 @@ menuentry 'Local' {
6 {{if kernel_params.osystem == "windows"}}
7 search --set=root --file /efi/Microsoft/Boot/bootmgfw.efi
8 chainloader /efi/Microsoft/Boot/bootmgfw.efi
9+ {{elif kernel_params.osystem == "centos"}}
10+ search --set=root --file /efi/centos/grubx64.efi
11+ chainloader /efi/centos/grubx64.efi
12+ {{elif kernel_params.osystem == "rhel"}}
13+ search --set=root --file /efi/redhat/grubx64.efi
14+ chainloader /efi/redhat/grubx64.efi
15 {{else}}
16 search --set=root --file /efi/ubuntu/grubx64.efi
17 chainloader /efi/ubuntu/grubx64.efi

Subscribers

People subscribed via source and target branches