mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-11-20 17:32:15 +00:00
717d8fa2c0
Some aarch64 UEFI firmware ignores a boot file name without the .efi suffix and requests grubaa64.efi instead. xcat-core/#7980 made xCAT::DHCP::BootPolicy->grub2_node_loader the one place that name is chosen, and the ISC and DHCPv4 paths of makedhcp call it. kea_bootfile_url6_for_node in dhcp.pm builds the name itself, as "grub2-$node", so the RFC 5970 bootfile-url of an aarch64 node never carries the suffix and the node loads nothing. The routine also had no node architecture to decide on: kea_build_node_reservations6 does not read the nodetype table. kea_build_node_reservations6 now reads nodetype.arch and noderes.tftpdir, kea_node_reservations6 passes the nodetype entry on, and kea_bootfile_url6_for_node asks grub2_node_loader for the name. dhcp_grub2_node_loader.t, which holds the name down for the other two paths, now asserts the DHCPv6 URL over its whole case table. Without this change 2 of its 62 assertions fail: the two aarch64 cases where nodeset has published the .efi link. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>