starlingx
/
stx-puppet
Code Issues Proposed changes

Update dnsmasq.conf for UEFI pxeboot 

Due to recent grub2 update for CVE-2020-15705, pxeboot must use the
shim.efi file for secure boot, rather than grubx64.efi directly.

Change-Id: I864ff46f449e92dfd5f1667379bc56aaaf6dfe2c
Closes-Bug: 1927730
Depends-On: https://review.opendev.org/c/starlingx/metal/+/790253
Depends-On: https://review.opendev.org/c/starlingx/integ/+/790254
Signed-off-by: Don Penney <don.penney@windriver.com>
This commit is contained in:
Don Penney 2021-05-07 08:51:19 -04:00
parent 7ced800f8d
commit 9782bb104c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
puppet-manifests/src/modules/platform/templates/dnsmasq.conf.erb
View File

@ -56,7 +56,7 @@ dhcp-option=option6:224,<%= @install_uuid %>
#
dhcp-match=set:efi,option:client-arch,2
dhcp-match=set:efi,option:client-arch,6
dhcp-match=set:efi,option:client-arch,7
dhcp-match=set:uefi,option:client-arch,7
dhcp-match=set:efi,option:client-arch,8
dhcp-match=set:efi,option:client-arch,9
dhcp-match=set:bios,option:client-arch,0
@ -80,6 +80,9 @@ dhcp-boot=tag:bios,tag:mgmt,pxelinux.0,<%= @mgmt_hostname %>,<%= @mgmt_controlle
dhcp-boot=tag:efi,tag:pxeboot,EFI/grubx64.efi,<%= @pxeboot_hostname %>,<%= @pxeboot_controller_address %>
dhcp-boot=tag:efi,tag:mgmt,EFI/grubx64.efi,<%= @mgmt_hostname %>,<%= @mgmt_controller_address %>
dhcp-boot=tag:uefi,tag:pxeboot,EFI/shim.efi,<%= @pxeboot_hostname %>,<%= @pxeboot_controller_address %>
dhcp-boot=tag:uefi,tag:mgmt,EFI/shim.efi,<%= @mgmt_hostname %>,<%= @mgmt_controller_address %>
# Do not forward queries for plain names (no dots)
domain-needed
# Query the upstream servers in the order they appear. This is necessary when