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

manager/user: Only enable WifiDebug1 if running on Galileo

Browse source
This commit is contained in:
Vicki Pfau 2024-08-15 20:30:18 -07:00
parent 1de2109c6d
commit 4f9f0f8e1d
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/hardware.rs
View file

@ -19,8 +19,9 @@ use crate::systemd::SystemdUnit;
const BOARD_VENDOR_PATH: &str = "/sys/class/dmi/id/board_vendor"; const BOARD_VENDOR_PATH: &str = "/sys/class/dmi/id/board_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, Copy, Clone)] #[derive(PartialEq, Debug, Default, Copy, Clone)]
pub(crate) enum HardwareVariant { pub(crate) enum HardwareVariant {
#[default]
Unknown, Unknown,
Jupiter, Jupiter,
Galileo, Galileo,

9
src/manager/user.rs
View file

@ -18,7 +18,9 @@ use crate::cec::{HdmiCecControl, HdmiCecState};
use crate::daemon::user::Command; use crate::daemon::user::Command;
use crate::daemon::DaemonCommand; use crate::daemon::DaemonCommand;
use crate::error::{to_zbus_error, to_zbus_fdo_error, zbus_to_zbus_fdo}; use crate::error::{to_zbus_error, to_zbus_fdo_error, zbus_to_zbus_fdo};
use crate::hardware::{check_support, is_deck, HardwareCurrentlySupported}; use crate::hardware::{
check_support, is_deck, variant, HardwareCurrentlySupported, HardwareVariant,
};
use crate::job::JobManagerCommand; use crate::job::JobManagerCommand;
use crate::platform::platform_config; use crate::platform::platform_config;
use crate::power::{ use crate::power::{
@ -638,7 +640,10 @@ pub(crate) async fn create_interfaces(
object_server.at(MANAGER_PATH, update_dock).await?; object_server.at(MANAGER_PATH, update_dock).await?;
} }
if variant().await.unwrap_or_default() == HardwareVariant::Galileo {
object_server.at(MANAGER_PATH, wifi_debug).await?; object_server.at(MANAGER_PATH, wifi_debug).await?;
}
object_server object_server
.at(MANAGER_PATH, wifi_power_management) .at(MANAGER_PATH, wifi_power_management)
.await?; .await?;
@ -703,7 +708,7 @@ mod test {
.await?; .await?;
} }
fake_model(HardwareVariant::Jupiter).await?; fake_model(HardwareVariant::Galileo).await?;
power::test::create_nodes().await?; power::test::create_nodes().await?;
create_interfaces(connection.clone(), connection.clone(), tx_ctx, tx_job).await?; create_interfaces(connection.clone(), connection.clone(), tx_ctx, tx_job).await?;