diff --git a/src/hardware.rs b/src/hardware.rs index 63ac601..8bc4781 100644 --- a/src/hardware.rs +++ b/src/hardware.rs @@ -19,8 +19,9 @@ use crate::systemd::SystemdUnit; const BOARD_VENDOR_PATH: &str = "/sys/class/dmi/id/board_vendor"; 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 { + #[default] Unknown, Jupiter, Galileo, diff --git a/src/manager/user.rs b/src/manager/user.rs index 9fa62ff..27d24e7 100644 --- a/src/manager/user.rs +++ b/src/manager/user.rs @@ -18,7 +18,9 @@ use crate::cec::{HdmiCecControl, HdmiCecState}; use crate::daemon::user::Command; use crate::daemon::DaemonCommand; 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::platform::platform_config; 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, wifi_debug).await?; + if variant().await.unwrap_or_default() == HardwareVariant::Galileo { + object_server.at(MANAGER_PATH, wifi_debug).await?; + } + object_server .at(MANAGER_PATH, wifi_power_management) .await?; @@ -703,7 +708,7 @@ mod test { .await?; } - fake_model(HardwareVariant::Jupiter).await?; + fake_model(HardwareVariant::Galileo).await?; power::test::create_nodes().await?; create_interfaces(connection.clone(), connection.clone(), tx_ctx, tx_job).await?;