archives/steamos-manager
archives/steamos-manager
2
0
Fork 1
mirror of https://gitlab.steamos.cloud/holo/steamos-manager.git synced 2025-07-05 14:10:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

hardware: Switch from using board_vendor to sys_vendor

Browse source
This commit is contained in:
Vicki Pfau 2025-02-20 18:19:00 -08:00
parent e7b94c28a0
commit cd9558fd67
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/hardware.rs
View file

@ -17,7 +17,7 @@ use crate::platform::{platform_config, ServiceConfig};
use crate::process::{run_script, script_exit_code}; use crate::process::{run_script, script_exit_code};
use crate::systemd::SystemdUnit; use crate::systemd::SystemdUnit;
const BOARD_VENDOR_PATH: &str = "/sys/class/dmi/id/board_vendor"; const SYS_VENDOR_PATH: &str = "/sys/class/dmi/id/sys_vendor";
const BOARD_NAME_PATH: &str = "/sys/class/dmi/id/board_name"; const BOARD_NAME_PATH: &str = "/sys/class/dmi/id/board_name";
#[derive(PartialEq, Debug, Default, Copy, Clone)] #[derive(PartialEq, Debug, Default, Copy, Clone)]
@ -59,8 +59,8 @@ pub enum FactoryResetKind {
} }
pub(crate) async fn variant() -> Result<HardwareVariant> { pub(crate) async fn variant() -> Result<HardwareVariant> {
let board_vendor = fs::read_to_string(path(BOARD_VENDOR_PATH)).await?; let sys_vendor = fs::read_to_string(path(SYS_VENDOR_PATH)).await?;
if board_vendor.trim_end() != "Valve" { if sys_vendor.trim_end() != "Valve" {
return Ok(HardwareVariant::Unknown); return Ok(HardwareVariant::Unknown);
} }
@ -156,13 +156,13 @@ pub mod test {
pub(crate) async fn fake_model(model: HardwareVariant) -> Result<()> { pub(crate) async fn fake_model(model: HardwareVariant) -> Result<()> {
create_dir_all(crate::path("/sys/class/dmi/id")).await?; create_dir_all(crate::path("/sys/class/dmi/id")).await?;
match model { match model {
HardwareVariant::Unknown => write(crate::path(BOARD_VENDOR_PATH), "LENOVO\n").await?, HardwareVariant::Unknown => write(crate::path(SYS_VENDOR_PATH), "LENOVO\n").await?,
HardwareVariant::Jupiter => { HardwareVariant::Jupiter => {
write(crate::path(BOARD_VENDOR_PATH), "Valve\n").await?; write(crate::path(SYS_VENDOR_PATH), "Valve\n").await?;
write(crate::path(BOARD_NAME_PATH), "Jupiter\n").await?; write(crate::path(BOARD_NAME_PATH), "Jupiter\n").await?;
} }
HardwareVariant::Galileo => { HardwareVariant::Galileo => {
write(crate::path(BOARD_VENDOR_PATH), "Valve\n").await?; write(crate::path(SYS_VENDOR_PATH), "Valve\n").await?;
write(crate::path(BOARD_NAME_PATH), "Galileo\n").await?; write(crate::path(BOARD_NAME_PATH), "Galileo\n").await?;
} }
} }
@ -178,12 +178,12 @@ pub mod test {
.expect("create_dir_all"); .expect("create_dir_all");
assert!(variant().await.is_err()); assert!(variant().await.is_err());
write(crate::path(BOARD_VENDOR_PATH), "LENOVO\n") write(crate::path(SYS_VENDOR_PATH), "LENOVO\n")
.await .await
.expect("write"); .expect("write");
assert_eq!(variant().await.unwrap(), HardwareVariant::Unknown); assert_eq!(variant().await.unwrap(), HardwareVariant::Unknown);
write(crate::path(BOARD_VENDOR_PATH), "Valve\n") write(crate::path(SYS_VENDOR_PATH), "Valve\n")
.await .await
.expect("write"); .expect("write");
write(crate::path(BOARD_NAME_PATH), "Jupiter\n") write(crate::path(BOARD_NAME_PATH), "Jupiter\n")

4
src/manager/root.rs
View file

@ -457,9 +457,7 @@ mod test {
async fn start() -> Result<TestHandle> { async fn start() -> Result<TestHandle> {
let mut handle = testing::start(); let mut handle = testing::start();
create_dir_all(crate::path("/sys/class/dmi/id")).await?; fake_model(HardwareVariant::Jupiter).await?;
write(crate::path("/sys/class/dmi/id/board_vendor"), "Valve\n").await?;
write(crate::path("/sys/class/dmi/id/board_name"), "Jupiter\n").await?;
create_dir_all(crate::path("/etc/NetworkManager/conf.d")).await?; create_dir_all(crate::path("/etc/NetworkManager/conf.d")).await?;
write( write(
crate::path("/etc/NetworkManager/conf.d/99-valve-wifi-backend.conf"), crate::path("/etc/NetworkManager/conf.d/99-valve-wifi-backend.conf"),