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

Merge "bootloader: fix arm64 install path"

Browse Source
This commit is contained in:
Zuul 2022-02-22 03:17:20 +00:00 committed by Gerrit Code Review
commit 6b3af23854
1 changed files with 7 additions and 4 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

@ -94,10 +94,13 @@ GRUB_OPTS="--force "
# * --target tells grub what's the target platform # * --target tells grub what's the target platform
# * the boot images are placed in /usr/lib/grub/<cpu>-<platform> # * the boot images are placed in /usr/lib/grub/<cpu>-<platform>
# * i386-pc is used for BIOS-based machines # * i386-pc is used for BIOS-based machines
# http://www.gnu.org/software/grub/manual/grub.html#Installation # http://www.gnu.org/software/grub/manual/grub.html#Installation
# # * this check is only valid for x86_64; other platforms we support
if [[ -d /sys/firmware/efi && ! -d /usr/lib/grub/*-efi ]]; then # are either not EFI (ppc) or always EFI (arm64)
GRUB_OPTS="$GRUB_OPTS --target=i386-pc" if [[ "x86_64 amd64" =~ ${ARCH} ]]; then
if [[ -d /sys/firmware/efi && ! -d /usr/lib/grub/x86_64-efi ]]; then
GRUB_OPTS="$GRUB_OPTS --target=i386-pc"
fi
fi fi
if [[ "$ARCH" =~ "ppc" ]] ; then if [[ "$ARCH" =~ "ppc" ]] ; then