From f7ba7ba1de3bcf82440ba0784908cbd83e34054f Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 3 Mar 2021 12:05:46 +1300 Subject: [PATCH] Use the same bootloader pkg-map for all redhat family The only difference between the rhel and redhat entries is rhel has the extra grub-efi-x86_64 mapping. All redhat family releases would benefit from having this too, so this change removes the whole rhel entry and adds grub-efi-x86_64 to the redhat family. The assumption is that anything which applies to rhel also applies to centos-stream, and in this case doesn't harm centos or fedora either. Change-Id: I0dc44c1f2b57516742f4c3e43cfc8874d6b90fa2 --- diskimage_builder/elements/bootloader/pkg-map | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/diskimage_builder/elements/bootloader/pkg-map b/diskimage_builder/elements/bootloader/pkg-map index dd4d088e..a570ed11 100644 --- a/diskimage_builder/elements/bootloader/pkg-map +++ b/diskimage_builder/elements/bootloader/pkg-map @@ -1,18 +1,4 @@ { - "release": { - "rhel": { - "8": { - "extlinux": "syslinux-extlinux", - "grub-pc": "grub2-tools grub2", - "grub-efi-amd64": "grub2-tools grub2-pc grub2-efi-x64 grub2-efi-x64-modules", - "grub-efi-arm64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules", - "grub-efi-aarch64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules", - "grub-efi": "grub2-tools grub2-efi", - "grub-efi-x86_64": "grub2-tools grub2-efi-x64 grub2-efi-x64-modules", - "grub-ppc64": "grub2-tools grub2" - } - } - }, "family": { "gentoo": { "dkms_package": "", @@ -36,6 +22,7 @@ "grub-efi-arm64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules", "grub-efi-aarch64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules", "grub-efi": "grub2-tools grub2-efi", + "grub-efi-x86_64": "grub2-tools grub2-efi-x64 grub2-efi-x64-modules", "grub-ppc64": "grub2-tools grub2" } },