From 4aec9289d029a5321668b11a03e0f88349dbe9ca Mon Sep 17 00:00:00 2001 From: Ikey Doherty Date: Wed, 10 Jul 2024 22:31:34 +0100 Subject: [PATCH] manager: Default to None xbootldr/esp mountpoint if no devices can be found Signed-off-by: Ikey Doherty --- blsforme/src/manager.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/blsforme/src/manager.rs b/blsforme/src/manager.rs index 605d4ad..20e6f81 100644 --- a/blsforme/src/manager.rs +++ b/blsforme/src/manager.rs @@ -57,13 +57,17 @@ impl<'a> Manager<'a> { let mut mounts = Mounts { xbootldr: if let Some(point) = boot_env.xboot_mountpoint.as_ref() { Some(point.clone()) - } else { + } else if boot_env.xbootldr().is_some() { Some(config.root.path().join("boot")) + } else { + None }, esp: if let Some(point) = boot_env.esp_mountpoint.as_ref() { Some(point.clone()) - } else { + } else if boot_env.esp().is_some() { Some(config.root.path().join("efi")) + } else { + None }, };