diskimage-builder/diskimage_builder/elements/bootloader/pkg-map
Steve Baker 5caeba0c68 Ensure redhat efi packages are reinstalled during finalise
The rhel-8.4 qcow2 base image already has the grub2-efi-x64 package
installed on its single partition which has files installed to
/boot/efi..., however a partitioned image will have an empty /boot/efi
partition when running 50-bootloader. This means dnf will not install
grub2-efi-x64 when requested and /boot/efi will remain empty.

This commit makes the following changes:
- Refactors redhat bootloader pkg-map for the following:
  - Make x86_64/amd64, arm64/aarch64 adjancent so they don't diverge
  - Map grub-efi to packages installed to /usr
  - Map grub-efi-{arch} to packages installed to /boot/efi
- Removes packages grub-efi-{arch} before installing grub-efi and
  grub-efi-{arch}

Change-Id: Ia197feea34f43bd870fed30829b740596e6b2f48
2021-04-21 10:56:37 +12:00

39 lines
1.1 KiB
Plaintext

{
"family": {
"gentoo": {
"dkms_package": "",
"extlinux": "syslinux",
"grub-pc": "grub",
"grub-efi": "grub",
"grub-efi-amd64": "grub",
"grub-efi-arm64": "grub",
"grub-efi-aarch64": "grub"
},
"suse": {
"dkms_package": "",
"extlinux": "syslinux",
"grub-pc": "grub2",
"grub-efi": "grub2"
},
"redhat": {
"extlinux": "syslinux-extlinux",
"grub-pc": "grub2-tools grub2",
"grub-ppc64": "grub2-tools grub2",
"grub-efi": "grub2-tools grub2 efibootmgr",
"grub-efi-amd64": "grub2-efi-x64 grub2-efi-x64-modules shim-x64",
"grub-efi-x86_64": "grub2-efi-x64 grub2-efi-x64-modules shim-x64",
"grub-efi-arm64": "grub2-efi-aa64 grub2-efi-aa64-modules shim-aa64",
"grub-efi-aarch64": "grub2-efi-aa64 grub2-efi-aa64-modules shim-aa64"
}
},
"default": {
"dkms_package": "dkms",
"extlinux": "extlinux",
"grub-pc": "grub-pc",
"grub-efi": "efibootmgr",
"grub-efi-amd64": "grub-efi grub-pc-bin",
"grub-efi-arm64": "grub-efi-arm64 grub-efi-arm64-bin",
"grub-ppc64": "grub-ieee1275"
}
}