mirrors/sprout
1
0
Fork 0
mirror of https://github.com/edera-dev/sprout.git synced 2025-12-19 13:50:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(chainload): support an empty initrd path, which will result in no initrd

Browse Source
This commit is contained in:
Alex Zenla
2025-10-27 16:27:39 -04:00
parent 59edd63a12
commit a76f9770dc
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/actions/chainload.rs
View File

@@ -89,10 +89,17 @@ pub fn chainload(context: Rc<SproutContext>, configuration: &ChainloadConfigurat
options_holder = Some(options); options_holder = Some(options);
} }
// The initrd can be None or empty, so we need to collapse that into a single Option.
let initrd = configuration
.linux_initrd
.as_ref()
.map(|path| context.stamp(path))
.and_then(|path| if path.is_empty() { None } else { Some(path) });
// If an initrd is provided, register it with the EFI stack.
let mut initrd_handle = None; let mut initrd_handle = None;
if let Some(ref linux_initrd) = configuration.linux_initrd { if let Some(ref linux_initrd) = initrd {
let initrd_path = context.stamp(linux_initrd); let content = utils::read_file_contents(context.root().loaded_image_path()?, linux_initrd)
let content = utils::read_file_contents(context.root().loaded_image_path()?, &initrd_path)
.context("unable to read linux initrd")?; .context("unable to read linux initrd")?;
let handle = let handle =
MediaLoaderHandle::register(LINUX_EFI_INITRD_MEDIA_GUID, content.into_boxed_slice()) MediaLoaderHandle::register(LINUX_EFI_INITRD_MEDIA_GUID, content.into_boxed_slice())