identity: introspect basearch

This introspects node basearch from rpm-ostree, instead of using
build-time configuration and the internal mapping table.

src/identity/mod.rs

@@ -1,4 +1,3 @@
-mod basearch;
 mod platform;
 
 use crate::config::inputs;
@@ -58,7 +57,7 @@ impl Identity {
 
     /// Try to build default agent identity.
     pub fn try_default() -> Fallible<Self> {
-        let basearch = basearch::read_basearch()?;
+        let basearch = rpm_ostree::basearch()?;
         let current_os = rpm_ostree::booted().context("failed to introspect booted OS image")?;
         let node_uuid = {
             let app_id = id128::Id128::try_from_slice(APP_ID)

src/rpm_ostree/cli_status.rs

@@ -18,6 +18,8 @@ pub struct DeploymentJSON {
     booted: bool,
     #[serde(rename = "base-checksum")]
     base_checksum: Option<String>,
+    #[serde(rename = "coreos-assembler.basearch")]
+    basearch: String,
     checksum: String,
     version: String,
 }
@@ -39,8 +41,20 @@ impl DeploymentJSON {
     }
 }
 
+/// Return base architecture for booted deployment.
+pub fn basearch() -> Fallible<String> {
+    let json = booted_json()?;
+    Ok(json.basearch)
+}
+
 /// Find the booted deployment.
 pub fn booted() -> Fallible<Release> {
+    let json = booted_json()?;
+    Ok(json.into_release())
+}
+
+/// Return JSON object for booted deployment.
+fn booted_json() -> Fallible<DeploymentJSON> {
     let cmd = std::process::Command::new("rpm-ostree")
         .arg("status")
         .arg("--json")
@@ -64,5 +78,6 @@ pub fn booted() -> Fallible<Release> {
 
     ensure!(!booted.base_revision().is_empty(), "empty base revision");
     ensure!(!booted.version.is_empty(), "empty version");
-    Ok(booted.into_release())
+    ensure!(!booted.basearch.is_empty(), "empty basearch");
+    Ok(booted)
 }

src/rpm_ostree/mod.rs

@@ -1,7 +1,7 @@
 mod cli_deploy;
 mod cli_finalize;
 mod cli_status;
-pub use cli_status::booted;
+pub use cli_status::{basearch, booted};
 
 mod actor;
 pub use actor::{FinalizeDeployment, RpmOstreeClient, StageDeployment};