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

fixes for disk list

Browse Source
This commit is contained in:
Aiden McClelland
2021-09-14 22:51:51 -06:00
committed by Aiden McClelland
parent 55b003cb72
commit 6556caf55d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
appmgr/src/disk/util.rs
View File

@@ -86,7 +86,7 @@ pub async fn get_model<P: AsRef<Path>>(path: P) -> Result<Option<String>, Error>
pub async fn get_capacity<P: AsRef<Path>>(path: P) -> Result<usize, Error> { pub async fn get_capacity<P: AsRef<Path>>(path: P) -> Result<usize, Error> {
Ok(String::from_utf8( Ok(String::from_utf8(
Command::new("BlockDevice") Command::new("blockdev")
.arg("--getsize64") .arg("--getsize64")
.arg(path.as_ref()) .arg(path.as_ref())
.invoke(crate::ErrorKind::BlockDevice) .invoke(crate::ErrorKind::BlockDevice)
@@ -97,7 +97,7 @@ pub async fn get_capacity<P: AsRef<Path>>(path: P) -> Result<usize, Error> {
pub async fn get_label<P: AsRef<Path>>(path: P) -> Result<Option<String>, Error> { pub async fn get_label<P: AsRef<Path>>(path: P) -> Result<Option<String>, Error> {
let label = String::from_utf8( let label = String::from_utf8(
Command::new("lsblk ") Command::new("lsblk")
.arg("-no") .arg("-no")
.arg("label") .arg("label")
.arg(path.as_ref()) .arg(path.as_ref())
@@ -162,7 +162,7 @@ pub async fn list() -> Result<Vec<DiskInfo>, Error> {
disks.insert(disk.clone(), IndexSet::new()); disks.insert(disk.clone(), IndexSet::new());
} }
if let Some(part_path) = part_path { if let Some(part_path) = part_path {
let part_path = Path::new(DISK_PATH).join(disk_path); let part_path = Path::new(DISK_PATH).join(part_path);
let part = tokio::fs::canonicalize(&part_path).await.with_ctx(|_| { let part = tokio::fs::canonicalize(&part_path).await.with_ctx(|_| {
( (
crate::ErrorKind::Filesystem, crate::ErrorKind::Filesystem,