From 7060ce3e3951f070475e0c977fd3bf93e335d810 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 27 Nov 2024 13:17:41 +0100 Subject: [PATCH] Refs #36833 - Correct File.join call on bootloader-universe When using File.join, all components should be separate arguments. Fixes: 1345bb430e2e ("Fixes #36833 - Add SecureBoot support for arbitrary operating systems to "Grub2 UEFI" PXE loaders") --- modules/tftp/server.rb | 2 +- test/tftp/tftp_server_test.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/tftp/server.rb b/modules/tftp/server.rb index 32e7f83e4..3aa4e0d22 100644 --- a/modules/tftp/server.rb +++ b/modules/tftp/server.rb @@ -110,7 +110,7 @@ def pxeconfig_file(mac) class Pxegrub2 < Server def bootloader_path(os, release, arch) [release, "default"].each do |version| - bootloader_path = File.join(path, 'bootloader-universe/pxegrub2', os, version, arch) + bootloader_path = File.join(path, 'bootloader-universe', 'pxegrub2', os, version, arch) logger.debug "TFTP: Checking if bootloader universe is configured for OS '#{os}' version '#{version}' (#{arch})." diff --git a/test/tftp/tftp_server_test.rb b/test/tftp/tftp_server_test.rb index 80a8c5c41..3ac706526 100644 --- a/test/tftp/tftp_server_test.rb +++ b/test/tftp/tftp_server_test.rb @@ -141,14 +141,14 @@ def test_pxeconfig_dir end def test_release_specific_bootloader_path - release_specific_bootloader_path = File.join(@subject.path, "bootloader-universe/pxegrub2", @os, @release, @arch) + release_specific_bootloader_path = File.join(@subject.path, "bootloader-universe", "pxegrub2", @os, @release, @arch) Dir.stubs(:exist?).with(release_specific_bootloader_path).returns(true).once assert_equal release_specific_bootloader_path, @subject.bootloader_path(@os, @release, @arch) end def test_default_bootloader_path - release_specific_bootloader_path = File.join(@subject.path, "bootloader-universe/pxegrub2", @os, @release, @arch) - default_bootloader_path = File.join(@subject.path, "bootloader-universe/pxegrub2", @os, "default", @arch) + release_specific_bootloader_path = File.join(@subject.path, "bootloader-universe", "pxegrub2", @os, @release, @arch) + default_bootloader_path = File.join(@subject.path, "bootloader-universe", "pxegrub2", @os, "default", @arch) Dir.stubs(:exist?).with(release_specific_bootloader_path).returns(false).once Dir.stubs(:exist?).with(default_bootloader_path).returns(true).once assert_equal default_bootloader_path, @subject.bootloader_path(@os, @release, @arch)