Merge ~xnox/maas:compatible-grub.cfg into maas:master

[Dimitri John Ledkov]

provisioningserver: generate grub.cfg suitable for both arm64 & amd64

This grub.cfg provisioning enrollment grub.cfg is suitable to be booted by either secureboot signed grub arm64 build, or the older unsigned network boot grub arm64 build as produced by bootloaders maas-images build.

This change will allow for the current/new maas to use either the current arm64 grub builds, or the new secureboot signed arm64 grub builds.

This alone will not obviously enable older/stable maas to use arm64 secureboot signed grub. But this change might be easy enough to backport to older maas series.

I did not test this, but it is the right syntax.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b compatible-grub.cfg lp:~xnox/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c12d85dc4c391fe1ef0750748d2a8477940310c6

review: Approve

[Dimitri John Ledkov (xnox)]

however this will not do much good.

this will allow to use the old bootloaders with new maas; but that is not a problem, cause we can make new maas use new bootloaders revisions too.

the issue is more pressing with making the new bootloader work with old maas, which might not be upgraded at all.

review: Disapprove

Unmerged commits

c12d85d... by Dimitri John Ledkov on 2021-02-04

provisioningserver: generate grub.cfg suitable for both arm64 & amd64

This grub.cfg provisioning enrollment grub.cfg is suitable to be
booted by either secureboot signed grub arm64 build, or the older
unsigned network boot grub arm64 build as produced by bootloaders
maas-images build.

diff --git a/src/provisioningserver/boot/install_grub.py b/src/provisioningserver/boot/install_grub.py
index 27ebd36..b43b8ed 100644
--- a/src/provisioningserver/boot/install_grub.py
+++ b/src/provisioningserver/boot/install_grub.py
@@ -15,9 +15,17 @@ CONFIG_FILE = """
 # Load based on MAC address first.
 configfile /grub/grub.cfg-${net_default_mac}
 
+if [ "$platform" = "x86_64-efi" ]; then
 # Failed to load based on MAC address.
 # Load amd64 by default, UEFI only supported by 64-bit
 configfile /grub/grub.cfg-default-amd64
+fi
+
+if [ "$platform" = "arm64-efi" ]; then
+# Failed to load based on MAC address.
+# Load arm64 by default, UEFI only supported by 64-bit
+configfile /grub/grub.cfg-default-arm64
+fi
 """
 
 
diff --git a/src/provisioningserver/boot/uefi_amd64.py b/src/provisioningserver/boot/uefi_amd64.py
index 4e42c78..5a73dec 100644
--- a/src/provisioningserver/boot/uefi_amd64.py
+++ b/src/provisioningserver/boot/uefi_amd64.py
@@ -26,9 +26,17 @@ CONFIG_FILE = dedent(
     # Load based on MAC address first.
     configfile (pxe)/grub/grub.cfg-${net_default_mac}
 
+    if [ "$platform" = "x86_64-efi" ]; then
     # Failed to load based on MAC address.
     # Load amd64 by default, UEFI only supported by 64-bit
     configfile (pxe)/grub/grub.cfg-default-amd64
+    fi
+
+    if [ "$platform" = "arm64-efi" ]; then
+    # Failed to load based on MAC address.
+    # Load arm64 by default, UEFI only supported by 64-bit
+    configfile (pxe)/grub/grub.cfg-default-arm64
+    fi
     """
 )