sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fixes for centos-9-stream efi behaviour"

Browse Source
This commit is contained in:
Zuul 2022-01-19 21:27:14 +00:00 committed by Gerrit Code Review
commit 3df51c5279
1 changed files with 1 additions and 2 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

@ -34,7 +34,6 @@ elif [[ "${DIB_BLOCK_DEVICE}" == "mbr" ||
"${DIB_BLOCK_DEVICE}" == "gpt" ]]; then "${DIB_BLOCK_DEVICE}" == "gpt" ]]; then
install-packages -m bootloader grub-pc install-packages -m bootloader grub-pc
elif [[ "${DIB_BLOCK_DEVICE}" == "efi" ]]; then elif [[ "${DIB_BLOCK_DEVICE}" == "efi" ]]; then
install-packages -e -m bootloader grub-efi-$ARCH
install-packages -m bootloader grub-efi grub-efi-$ARCH install-packages -m bootloader grub-efi grub-efi-$ARCH
else else
echo "Failure: I'm not sure what bootloader to install" echo "Failure: I'm not sure what bootloader to install"
@ -96,7 +95,7 @@ if [[ ! $GRUB_OPTS == *--target* ]] && [[ $($GRUBNAME --version) =~ ' 2.' ]]; th
# http://www.gnu.org/software/grub/manual/grub.html#Installation # http://www.gnu.org/software/grub/manual/grub.html#Installation
# #
if [ -d /sys/firmware/efi ]; then if [ -d /sys/firmware/efi ]; then
if [ ! -d /usr/lib/grub/*-efi ]; then if [[ ${DIB_BLOCK_DEVICE} == "mbr" || ${DIB_BLOCK_DEVICE} == "gpt" ]]; then
case $ARCH in case $ARCH in
"x86_64"|"amd64") "x86_64"|"amd64")
GRUB_OPTS="$GRUB_OPTS --target=i386-pc" GRUB_OPTS="$GRUB_OPTS --target=i386-pc"