From fbc94cfbfc02ec5c54b03aac19b7eed74d986cb3 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Thu, 16 Nov 2023 14:48:33 -0700
Subject: [PATCH] allow non-zero exit `cpupower frequency-info -g` (#2523)

* set better governor hierarchy and add cli command to change

* allow non-zero exit `cpupower frequency-info -g`
---
 core/startos/src/util/cpupower.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/startos/src/util/cpupower.rs b/core/startos/src/util/cpupower.rs
index 7fa850a88..cc4ac5ef4 100644
--- a/core/startos/src/util/cpupower.rs
+++ b/core/startos/src/util/cpupower.rs
@@ -39,13 +39,12 @@ impl std::borrow::Borrow<str> for Governor {
 }
 
 pub async fn get_available_governors() -> Result<BTreeSet<Governor>, Error> {
-    let raw = String::from_utf8(
-        Command::new("cpupower")
-            .arg("frequency-info")
-            .arg("-g")
-            .invoke(ErrorKind::CpuSettings)
-            .await?,
-    )?;
+    let raw = Command::new("cpupower")
+        .arg("frequency-info")
+        .arg("-g")
+        .invoke(ErrorKind::CpuSettings)
+        .await
+        .map_or_else(|e| Ok(e.source.to_string()), String::from_utf8)?;
     let mut for_cpu: OrdMap<u32, BTreeSet<Governor>> = OrdMap::new();
     let mut current_cpu = None;
     for line in raw.lines() {