Skip to content

Use GRUB for OCI #849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Use GRUB for OCI #849

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion live-build/config/hooks/vm-artifacts/90-raw-disk-image.binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ done
#
# Mount /boot/efi and do grub and bootctl install
#
EFI_DIR="/mnt/boot/efi"
EFI_DIR="/boot/efi"
chroot "$DIRECTORY" mkdir -p $EFI_DIR
chroot "$DIRECTORY" mount /dev/mapper/${LOOPNAME}p2 $EFI_DIR

Expand All @@ -356,6 +356,18 @@ chroot "$DIRECTORY" cp /boot/initrd.img $EFI_DIR
chroot "$DIRECTORY" cp /boot/vmlinuz $EFI_DIR
chroot "$DIRECTORY" bootctl --esp-path=$EFI_DIR install --no-variables

#
# Install GRUB if building for OCI
#
if [[ "$APPLIANCE_PLATFORM" == oci ]] || [[ "$APPLIANCE_PLATFORM" == oci ]]; then
chroot "$DIRECTORY" mount -t zfs "$FSNAME/grub" /mnt
# chroot "$DIRECTORY" grub-install --root-directory=/mnt "/dev/$LOOPNAME"
chroot "$DIRECTORY" grub-install --target=x86_64-efi --efi-directory="$EFI_DIR" \
--root-directory=/mnt --bootloader-id=GRUB --no-nvram
chroot "$DIRECTORY" grub-mkconfig -o /mnt/boot/grub/grub.cfg
chroot "$DIRECTORY" umount /mnt
fi

# Use GRUB_CMDLINE_LINUX_DEFAULT boot options
source $DIRECTORY/etc/default/grub.d/override.cfg
cat <<-EOF >"${DIRECTORY}/${EFI_DIR}/loader/entries/delphix.conf"
Expand Down
Loading