Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 04:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix firmware checker

Browse Source
This commit is contained in:
Aiden McClelland
2024-07-29 12:20:13 -06:00
parent ccbb68aa0c
commit 36cc9cc1ec
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/startos/src/firmware.rs
View File

@@ -13,8 +13,8 @@ use crate::util::Invoke;
use crate::PLATFORM; use crate::PLATFORM;
/// Part of the Firmware, look there for more about /// Part of the Firmware, look there for more about
#[derive(Clone, Deserialize, Serialize)] #[derive(Debug, Clone, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "kebab-case")]
pub struct VersionMatcher { pub struct VersionMatcher {
/// Strip this prefix on the version matcher /// Strip this prefix on the version matcher
semver_prefix: Option<String>, semver_prefix: Option<String>,
@@ -27,8 +27,8 @@ pub struct VersionMatcher {
/// Inside a file that is firmware.json, we /// Inside a file that is firmware.json, we
/// wanted a structure that could help decide what to do /// wanted a structure that could help decide what to do
/// for each of the firmware versions /// for each of the firmware versions
#[derive(Clone, Deserialize, Serialize)] #[derive(Debug, Clone, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "kebab-case")]
pub struct Firmware { pub struct Firmware {
id: String, id: String,
/// This is the platform(s) the firmware was built for /// This is the platform(s) the firmware was built for
@@ -49,6 +49,7 @@ pub fn display_firmware_update_result(result: RequiresReboot) {
} }
} }
#[instrument]
pub async fn check_for_firmware_update() -> Result<Option<Firmware>, Error> { pub async fn check_for_firmware_update() -> Result<Option<Firmware>, Error> {
let system_product_name = String::from_utf8( let system_product_name = String::from_utf8(
Command::new("dmidecode") Command::new("dmidecode")
@@ -118,6 +119,7 @@ pub async fn check_for_firmware_update() -> Result<Option<Firmware>, Error> {
/// that the firmware was the correct and updated for /// that the firmware was the correct and updated for
/// systems like the Pure System that a new firmware /// systems like the Pure System that a new firmware
/// was released and the updates where pushed through the pure os. /// was released and the updates where pushed through the pure os.
#[instrument]
pub async fn update_firmware(firmware: Firmware) -> Result<(), Error> { pub async fn update_firmware(firmware: Firmware) -> Result<(), Error> {
let id = &firmware.id; let id = &firmware.id;
let firmware_dir = Path::new("/usr/lib/startos/firmware"); let firmware_dir = Path::new("/usr/lib/startos/firmware");