mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-09-24 16:54:03 +00:00
Daniel Hilst
5554b79c2d
The step that fills lib/firmware in the Ubuntu netboot initrd asked modinfo about $rootimg_dir/$module and looked a firmware name up under lib/firmware. The copy step beside it takes a module from $customdir or $pathtofiles first, and the kernel looks a firmware name up under updates/<kernel>, updates/, <kernel>/ and lib/firmware. So a custom driver reached the initrd with no firmware, even when the root image carried it, and a firmware override was left out of the initrd altogether. initrd_firmware_files now takes the module directories the copy step searches and the kernel release. It resolves each module in that order before asking modinfo, and keeps every firmware file that exists in the four directories the kernel searches, so the override still wins on the node. ubuntu_genimage_initrd_firmware.t covers both: its two new cases are red on the commit before this one. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>