Merge pull request fedora-iot#119 from say-paul/fix-os-type-detection

Detect OS via bootc incompatible flag; simplify logic

Author: say-paul

Cargo.toml

@@ -19,7 +19,7 @@ test = true
 anyhow = "1"
 log = "0.4"
 clap = { version = "4.0", features = ["derive"] }
-config = "0.13.4"
+config = "0.15.13"
 pretty_env_logger = "0.5.0"
 nix = "0.30.1"
 glob = "0.3.0"

src/lib/handler.rs

@@ -2,35 +2,54 @@
 
 use anyhow::{Context, Result, anyhow, bail};
 use serde_json::Value;
-use std::path::Path;
 use std::process::Command;
 use std::str;
 
 use crate::grub::get_boot_counter;
 
 /// Detects if the system is managed by bootc or is a rpm-ostree system
+/// Inspect bootc status JSON and decide based on `status.booted.incompatible`.
 fn detect_os_deployment() -> Option<&'static str> {
-    // 1. Check if this is a bootc-managed host.
-    if let Ok(output) = Command::new("bootc")
+    let output = match Command::new("bootc")
         .args(["status", "--booted", "--json"])
         .output()
-        && output.status.success()
-        && let Ok(json) = serde_json::from_slice::<Value>(&output.stdout)
-        && json.get("kind").and_then(|v| v.as_str()) == Some("BootcHost")
     {
-        log::info!("System detected as bootc-managed host.");
-        return Some("bootc");
-    }
+        Ok(output) => output,
+        Err(_) => return None,
+    };
 
-    // 2. If not bootc, check if it's an ostree-based OS by looking for /run/ostree-booted.
-    if Path::new("/run/ostree-booted").exists() {
-        log::info!("System detected as ostree-based (via /run/ostree-booted).");
-        return Some("rpm-ostree");
+    if !output.status.success() {
+        log::error!("'bootc status --booted --json' exited with non-zero status");
+        return None;
     }
 
-    // 3. If neither check passes, the deployment type is unsupported.
-    log::warn!("System is neither bootc nor a known ostree variant.");
-    None
+    let json: Value = match serde_json::from_slice::<Value>(&output.stdout) {
+        Ok(json) => json,
+        Err(_) => {
+            log::error!("Failed to parse JSON from 'bootc status --booted --json'");
+            return None;
+        }
+    };
+
+    match json
+        .get("status")
+        .and_then(|s| s.get("booted"))
+        .and_then(|b| b.get("incompatible"))
+        .and_then(|i| i.as_bool())
+    {
+        Some(true) => {
+            log::info!("System detected as rpm-ostree (incompatible=true)");
+            Some("rpm-ostree")
+        }
+        Some(false) => {
+            log::info!("System detected as bootc (incompatible=false)");
+            Some("bootc")
+        }
+        None => {
+            log::error!("bootc status JSON missing boolean field status.booted.incompatible");
+            None
+        }
+    }
 }
 
 /// reboots the system if boot_counter is greater than 0 or can be forced too

src/main.rs

@@ -9,7 +9,6 @@ use greenboot::{
     unset_boot_counter, unset_rollback_trigger,
 };
 use greenboot::{is_boot_rw, remount_boot_ro, remount_boot_rw};
-use serde::Deserialize;
 use std::process::Command;
 
 /// greenboot config path
@@ -25,7 +24,7 @@ struct Cli {
     #[clap(subcommand)]
     command: Commands,
 }
-#[derive(Debug, Deserialize)]
+#[derive(Debug)]
 /// config params for greenboot
 struct GreenbootConfig {
     max_reboot: u16,