openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Fix bootloader for efi on rhel systems"

This commit is contained in:
Zuul 2018-06-28 15:02:30 +00:00 committed by Gerrit Code Review
parent e796b3bc18 61e6566c48
commit 927e8115f6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,6 +224,14 @@ function install_grub2 {
if [ -d /sys/firmware/efi ]; then
sed -i 's%\(initrd\|linux\)efi /boot%\1 /boot%g' $GRUB_CFG
fi
# when using efi, and having linux16/initrd16, it needs to be replaced
# by linuxefi/initrdefi. When building images on a non-efi system,
# the 16 suffix is added to linux/initrd entries, but we need it to be
# linuxefi/initrdefi for the image to boot under efi
if [[ ${DIB_BLOCK_DEVICE} == "efi" ]]; then
sed -i 's%\(linux\|initrd\)16 /boot%\1efi /boot%g' $GRUB_CFG
fi
}
DIB_EXTLINUX=${DIB_EXTLINUX:-0}