From 5382f209ebb88bbd04ac3016bc71109154a00c9e Mon Sep 17 00:00:00 2001 From: june-fish Date: Tue, 17 Dec 2024 22:44:01 -0600 Subject: [PATCH 1/2] fix: submarine detection logic --- src/install.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/install.rs b/src/install.rs index d26e4ee..984a7cc 100644 --- a/src/install.rs +++ b/src/install.rs @@ -214,7 +214,11 @@ impl InstallationState { lsblk::BlockDevice::list()? .into_iter() .find(|d| d.is_part() - && d.disk_name().ok().as_deref() == blockdev.to_str() + && d.disk_name().ok().as_deref() + == blockdev + .strip_prefix("/dev/") + .unwrap_or(&PathBuf::from("")) + .to_str() && d.name.ends_with('2')) .ok_or_else(|| eyre!("Failed to find submarine partition"))? .name From 8aeb0a17c3a1ff966999248e9ddcbc5a2294e68a Mon Sep 17 00:00:00 2001 From: june-fish Date: Tue, 17 Dec 2024 22:44:46 -0600 Subject: [PATCH 2/2] fix: correct cgpt parition number --- src/install.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rs b/src/install.rs index 984a7cc..47a1d17 100644 --- a/src/install.rs +++ b/src/install.rs @@ -361,7 +361,7 @@ impl InstallationType { .args([ "add", "-i", - "1", + "2", "-t", "kernel", "-P",