From 90424e832997d73d018ec21fbb008d746c746c5c Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Fri, 16 Jun 2023 16:35:35 -0600 Subject: [PATCH] install fixes --- backend/src/disk/util.rs | 8 ++++---- backend/src/os_install/mod.rs | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/backend/src/disk/util.rs b/backend/src/disk/util.rs index 46c4f512e..b65842a7c 100644 --- a/backend/src/disk/util.rs +++ b/backend/src/disk/util.rs @@ -1,4 +1,4 @@ -use std::collections::BTreeMap; +use std::collections::{BTreeMap, BTreeSet}; use std::path::{Path, PathBuf}; use color_eyre::eyre::{self, eyre}; @@ -251,10 +251,10 @@ pub async fn recovery_info( #[instrument(skip_all)] pub async fn list(os: &OsPartitionInfo) -> Result, Error> { struct DiskIndex { - parts: IndexSet, + parts: BTreeSet, internal: bool, } - let disk_guids = pvscan().await?; + let disk_guids = dbg!(pvscan().await?); let disks = tokio_stream::wrappers::ReadDirStream::new( tokio::fs::read_dir(DISK_PATH) .await @@ -301,7 +301,7 @@ pub async fn list(os: &OsPartitionInfo) -> Result, Error> { disks.insert( disk.clone(), DiskIndex { - parts: IndexSet::new(), + parts: BTreeSet::new(), internal: false, }, ); diff --git a/backend/src/os_install/mod.rs b/backend/src/os_install/mod.rs index 10d546a97..c67be5ac6 100644 --- a/backend/src/os_install/mod.rs +++ b/backend/src/os_install/mod.rs @@ -297,12 +297,6 @@ pub async fn execute( .invoke(crate::ErrorKind::Grub) .await?; - Command::new("chroot") - .arg(¤t) - .arg("update-grub2") - .invoke(crate::ErrorKind::Grub) - .await?; - dev.unmount(false).await?; if let Some(efivarfs) = efivarfs { efivarfs.unmount(false).await?;