diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-08-03 13:05:47 +0200 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-08-03 13:07:22 +0200 |
| commit | 294046befae669dacd159d9f26bcdd3bc8ff26c9 (patch) | |
| tree | 93449fd35458602b8f23646e4dd903ae520b4383 /devstack | |
| parent | b39989f50e0181625e45f81063f4893f3e3fc63d (diff) | |
| download | ironic-294046befae669dacd159d9f26bcdd3bc8ff26c9.tar.gz | |
Use shim-signed on Ubuntu, shim is empty now
Also fix the documentation to use the correct paths and versions.
Change-Id: I7f004d40c1b8c617f9a456216df091e44d69693f
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ironic | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 71e1508d1..4a08242d9 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -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 |