Merge branch 'endrift/skip-polkit' into 'master'

manager: Bypass polkit helpers and call underlying scripts where applicable

See merge request holo/steamos-manager!17
This commit is contained in:
Vicki Pfau 2024-04-11 23:11:33 +00:00
commit 6a70d58d7a

View file

@ -200,20 +200,17 @@ impl SteamOSManager {
async fn update_bios(&self) -> zbus::fdo::Result<()> { async fn update_bios(&self) -> zbus::fdo::Result<()> {
// Update the bios as needed // Update the bios as needed
run_script( run_script("/usr/bin/jupiter-biosupdate", &["--auto"])
"/usr/bin/steamos-polkit-helpers/jupiter-biosupdate", .await
&["--auto"], .inspect_err(|message| error!("Error updating BIOS: {message}"))
) .map_err(anyhow_to_zbus_fdo)
.await
.inspect_err(|message| error!("Error updating BIOS: {message}"))
.map_err(anyhow_to_zbus_fdo)
} }
async fn update_dock(&self) -> zbus::fdo::Result<()> { async fn update_dock(&self) -> zbus::fdo::Result<()> {
// Update the dock firmware as needed // Update the dock firmware as needed
run_script( run_script(
"/usr/bin/steamos-polkit-helpers/jupiter-dock-updater", "/usr/lib/jupiter-dock-updater/jupiter-dock-updater.sh",
&[""], &[] as &[String; 0],
) )
.await .await
.inspect_err(|message| error!("Error updating dock: {message}")) .inspect_err(|message| error!("Error updating dock: {message}"))
@ -222,13 +219,10 @@ impl SteamOSManager {
async fn trim_devices(&self) -> zbus::fdo::Result<()> { async fn trim_devices(&self) -> zbus::fdo::Result<()> {
// Run steamos-trim-devices script // Run steamos-trim-devices script
run_script( run_script("/usr/lib/hwsupport/trim-devices.sh", &[] as &[String; 0])
"/usr/bin/steamos-polkit-helpers/steamos-trim-devices", .await
&[""], .inspect_err(|message| error!("Error updating trimming devices: {message}"))
) .map_err(anyhow_to_zbus_fdo)
.await
.inspect_err(|message| error!("Error updating trimming devices: {message}"))
.map_err(anyhow_to_zbus_fdo)
} }
async fn format_device( async fn format_device(