openstack/ironic
Code Issues Proposed changes

Use shim-signed on Ubuntu, shim is empty now

Browse Source 
Also fix the documentation to use the correct paths and versions.

Change-Id: I7f004d40c1b8c617f9a456216df091e44d69693f
This commit is contained in:
Dmitry Tantsur 2021-08-03 13:05:47 +02:00
parent b39989f50e
commit 294046befa
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindep.txt
View File

@ -22,7 +22,7 @@ syslinux [platform:rpm platform:ubuntu-trusty platform:debian-wheezy default]
syslinux-common [platform:ubuntu-xenial platform:debian-jessie default]
socat [default]
# Grub2 files for boot loadingusing PXE/GRUB2
shim [platform:dpkg default]
shim-signed [platform:dpkg default]
grub-efi-amd64-signed [platform:dpkg default]
# these are needed to create and access VMs when testing with virtual hardware

8
devstack/lib/ironic
View File

@ -626,7 +626,7 @@ UEFI_NVRAM_PATH=$IRONIC_UEFI_FILES_DIR/OVMF_VARS.fd
if [[ $IRONIC_HW_ARCH == "x86_64" ]]; then
install_package shim
if is_ubuntu; then
install_package grub-efi-amd64-signed
install_package grub-efi-amd64-signed shim-signed
elif is_fedora; then
install_package grub2-efi
fi
@ -651,7 +651,11 @@ if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then
fi
if is_ubuntu && [[ -z $IRONIC_GRUB2_FILE ]]; then
IRONIC_GRUB2_SHIM_FILE=/usr/lib/shim/shimx64.efi
if [[ -f /usr/lib/shim/shimx64.efi.signed ]]; then
IRONIC_GRUB2_SHIM_FILE=/usr/lib/shim/shimx64.efi.signed
else
IRONIC_GRUB2_SHIM_FILE=/usr/lib/shim/shimx64.efi
fi
IRONIC_GRUB2_FILE=/usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed
fi

6
doc/source/install/configure-pxe.rst
View File

@ -123,7 +123,7 @@ the PXE UEFI environment.
#. Install Grub2 and shim packages:
Ubuntu (16.04LTS and later)::
Ubuntu (18.04LTS and later)::
sudo apt-get install grub-efi-amd64-signed shim-signed
@ -137,9 +137,9 @@ the PXE UEFI environment.
#. Copy grub and shim boot loader images to ``/tftpboot`` directory:
Ubuntu (16.04LTS and later)::
Ubuntu (18.04LTS and later)::
sudo cp /usr/lib/shim/shim.efi.signed /tftpboot/bootx64.efi
sudo cp /usr/lib/shim/shimx64.efi.signed /tftpboot/bootx64.efi
sudo cp /usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed /tftpboot/grubx64.efi
Fedora::