Merge ~adam-collard/maas-images:jammy-bootloaders into maas-images:master

[Adam Collard]

Bump bootloaders to Jammy

[Alberto Donato (ack)]

lgtm

review: Approve

diff --git a/conf/bootloaders.yaml b/conf/bootloaders.yaml
index d7d2a67..d05f0a7 100644
--- a/conf/bootloaders.yaml
+++ b/conf/bootloaders.yaml
@@ -6,14 +6,10 @@ bootloaders:
    packages:
     - pxelinux
     - syslinux-common
-   arch: i386
-   arches: i386,amd64
+   arch: amd64
+   arches: amd64, i386
    archive: http://archive.ubuntu.com/ubuntu
-   release: focal
-   # pxelinux and syslinux-common were accidentally removed from main. It has
-   # been added back to main and is supported by foundations however because
-   # there have been no updates its still in universe.
-   allow_universe: True
+   release: jammy
    os: pxelinux
    files:
     - usr/lib/PXELINUX/pxelinux.0
@@ -26,7 +22,7 @@ bootloaders:
    arch: amd64
    arches: amd64
    archive: http://archive.ubuntu.com/ubuntu
-   release: focal
+   release: jammy
    os: grub-efi-signed
    files:
     - usr/lib/shim/shimx64.efi.signed.latest, bootx64.efi
@@ -38,7 +34,7 @@ bootloaders:
    arch: arm64
    arches: arm64
    archive: http://ports.ubuntu.com
-   release: focal
+   release: jammy
    os: grub-efi
    files:
     - usr/lib/shim/shimaa64.efi.signed.latest, bootaa64.efi