openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "bootloader: remove dangling grubenv links"

This commit is contained in:
Zuul 2020-09-17 01:01:42 +00:00 committed by Gerrit Code Review
parent 58034ef253 8f12d9530e
commit 1355421ce8
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,17 @@ function install_grub2 {
echo "Installing GRUB2..."
# When using EFI image-based builds, particularly rhel element
# based on RHEL>=8.2 .qcow2, we might have /boot/grub2/grubenv
# as a dangling symlink to /boot/efi because we have extracted
# it from the root fs, but we didn't populate the separate EFI
# boot partition from the image. grub2-install calls rename()
# on this file, so if it's a dangling symlink it errors. Just
# remove it if it exists.
if [[ -L /boot/grub2/grubenv ]]; then
rm -f /boot/grub2/grubenv
fi
# We need --force so grub does not fail due to being installed on the
# root partition of a block device.
GRUB_OPTS=${GRUB_OPTS:-"--force"}