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

add support for partition type uuid matching

Browse Source
This commit is contained in:
Alex Zenla
2025-10-14 01:45:49 -07:00
parent 4a5dc39c49
commit 7a0c32c191
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/extractors/filesystem_device_match.rs
View File

@@ -21,6 +21,8 @@ pub struct FilesystemDeviceMatchExtractor {
pub has_item: Option<String>, pub has_item: Option<String>,
#[serde(default, rename = "has-partition-uuid")] #[serde(default, rename = "has-partition-uuid")]
pub has_partition_uuid: Option<String>, pub has_partition_uuid: Option<String>,
#[serde(default, rename = "has-partition-type-uuid")]
pub has_partition_type_uuid: Option<String>,
#[serde(default)] #[serde(default)]
pub fallback: Option<String>, pub fallback: Option<String>,
} }
@@ -34,14 +36,15 @@ pub fn extract(
for handle in handles { for handle in handles {
let mut has_match = false; let mut has_match = false;
let partition_uuid = { let partition_info = {
let partition_info = uefi::boot::open_protocol_exclusive::<PartitionInfo>(handle); let partition_info = uefi::boot::open_protocol_exclusive::<PartitionInfo>(handle);
match partition_info { match partition_info {
Ok(partition_info) => { Ok(partition_info) => {
if let Some(gpt) = partition_info.gpt_partition_entry() { if let Some(gpt) = partition_info.gpt_partition_entry() {
let uuid = gpt.unique_partition_guid; let uuid = gpt.unique_partition_guid;
Some(uuid) let type_uuid = gpt.partition_type_guid;
Some((uuid, type_uuid.0))
} else { } else {
None None
} }
@@ -59,17 +62,28 @@ pub fn extract(
} }
}; };
if let Some(partition_uuid) = partition_uuid if let Some((partition_uuid, _partition_type_guid)) = partition_info
&& let Some(ref has_partition_uuid) = extractor.has_partition_uuid && let Some(ref has_partition_uuid) = extractor.has_partition_uuid
{ {
let parsed_uuid = Guid::from_str(has_partition_uuid) let parsed_uuid = Guid::from_str(has_partition_uuid)
.map_err(|e| anyhow!("failed to parse has-uuid: {}", e))?; .map_err(|e| anyhow!("failed to parse has-partition-uuid: {}", e))?;
if partition_uuid != parsed_uuid { if partition_uuid != parsed_uuid {
continue; continue;
} }
has_match = true; has_match = true;
} }
if let Some((_partition_uuid, partition_type_guid)) = partition_info
&& let Some(ref has_partition_type_uuid) = extractor.has_partition_type_uuid
{
let parsed_uuid = Guid::from_str(has_partition_type_uuid)
.map_err(|e| anyhow!("failed to parse has-partition-type-uuid: {}", e))?;
if partition_type_guid != parsed_uuid {
continue;
}
has_match = true;
}
let mut filesystem = uefi::boot::open_protocol_exclusive::<SimpleFileSystem>(handle) let mut filesystem = uefi::boot::open_protocol_exclusive::<SimpleFileSystem>(handle)
.context("failed to open filesystem protocol")?; .context("failed to open filesystem protocol")?;