openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Ensure redhat efi packages are reinstalled during finalise"

This commit is contained in:
Zuul 2021-04-26 01:08:04 +00:00 committed by Gerrit Code Review
parent da674c4e5b 5caeba0c68
commit d03e7f1327
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diskimage_builder/elements/bootloader/finalise.d/50-bootloader
View File

@ -65,7 +65,8 @@ function install_grub2 {
"${DIB_BLOCK_DEVICE}" == "gpt" ]]; then
install-packages -m bootloader grub-pc
elif [[ "${DIB_BLOCK_DEVICE}" == "efi" ]]; then
install-packages -m bootloader grub-efi-$ARCH
install-packages -e -m bootloader grub-efi-$ARCH
install-packages -m bootloader grub-efi grub-efi-$ARCH
else
echo "Failure: I'm not sure what bootloader to install"
echo "Ensure you have included a block-device-* element"

17
diskimage_builder/elements/bootloader/pkg-map
View File

@ -18,20 +18,21 @@
"redhat": {
"extlinux": "syslinux-extlinux",
"grub-pc": "grub2-tools grub2",
"grub-efi-amd64": "grub2-tools grub2 grub2-pc grub2-efi-x64 grub2-efi-x64-modules efibootmgr shim-x64",
"grub-efi-arm64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules efibootmgr shim-aa64",
"grub-efi-aarch64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules efibootmgr shim-aa64",
"grub-efi": "grub2-tools grub2-efi efibootmgr",
"grub-efi-x86_64": "grub2-tools grub2 grub2-efi-x64 grub2-efi-x64-modules efibootmgr shim-x64",
"grub-ppc64": "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-amd64": "grub-efi grub-pc-bin efibootmgr",
"grub-efi-arm64": "grub-efi-arm64 grub-efi-arm64-bin efibootmgr",
"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"
}
}

2
diskimage_builder/elements/yum/bin/install-packages
View File

@ -53,7 +53,7 @@ while getopts "hud:em:" opt; do
DOWNLOAD_PATH=$OPTARG
;;
e)
ACTION="erase"
ACTION="remove"
;;
m)
MAP_ELEMENT=$OPTARG