Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
raboneko committed Dec 18, 2024
2 parents e7eab5e + 8aeb0a1 commit ec9198c
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -357,7 +361,7 @@ impl InstallationType {
.args([
"add",
"-i",
"1",
"2",
"-t",
"kernel",
"-P",
Expand Down

0 comments on commit ec9198c

Please sign in to comment.