Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 02:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

install fixes

Browse Source
This commit is contained in:
Aiden McClelland
2023-06-16 16:35:35 -06:00
committed by Aiden McClelland
parent 1bfeb42a06
commit 90424e8329
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/disk/util.rs
View File

@@ -1,4 +1,4 @@
use std::collections::BTreeMap; use std::collections::{BTreeMap, BTreeSet};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use color_eyre::eyre::{self, eyre}; use color_eyre::eyre::{self, eyre};
@@ -251,10 +251,10 @@ pub async fn recovery_info(
#[instrument(skip_all)] #[instrument(skip_all)]
pub async fn list(os: &OsPartitionInfo) -> Result<Vec<DiskInfo>, Error> { pub async fn list(os: &OsPartitionInfo) -> Result<Vec<DiskInfo>, Error> {
struct DiskIndex { struct DiskIndex {
parts: IndexSet<PathBuf>, parts: BTreeSet<PathBuf>,
internal: bool, internal: bool,
} }
let disk_guids = pvscan().await?; let disk_guids = dbg!(pvscan().await?);
let disks = tokio_stream::wrappers::ReadDirStream::new( let disks = tokio_stream::wrappers::ReadDirStream::new(
tokio::fs::read_dir(DISK_PATH) tokio::fs::read_dir(DISK_PATH)
.await .await
@@ -301,7 +301,7 @@ pub async fn list(os: &OsPartitionInfo) -> Result<Vec<DiskInfo>, Error> {
disks.insert( disks.insert(
disk.clone(), disk.clone(),
DiskIndex { DiskIndex {
parts: IndexSet::new(), parts: BTreeSet::new(),
internal: false, internal: false,
}, },
); );

6
backend/src/os_install/mod.rs
View File

@@ -297,12 +297,6 @@ pub async fn execute(
.invoke(crate::ErrorKind::Grub) .invoke(crate::ErrorKind::Grub)
.await?; .await?;
Command::new("chroot")
.arg(&current)
.arg("update-grub2")
.invoke(crate::ErrorKind::Grub)
.await?;
dev.unmount(false).await?; dev.unmount(false).await?;
if let Some(efivarfs) = efivarfs { if let Some(efivarfs) = efivarfs {
efivarfs.unmount(false).await?; efivarfs.unmount(false).await?;