composefs: Backwards compatibility for fetching image info

For older systems that do not have the `.imginfo` file, we revert back
to our older logic of fetching the image info from registry

Signed-off-by: Pragyan Poudyal <[email protected]>

Author: Johan-Liebert1

crates/lib/src/bootc_composefs/state.rs

@@ -211,8 +211,6 @@ pub(crate) async fn write_composefs_state(
         ..
     } = &target_imgref;
 
-    println!("imgref: {target_imgref:#?}");
-
     let imgref = get_imgref(&transport, &image_name);
 
     let mut config = tini::Ini::new().section("origin").item(

crates/lib/src/bootc_composefs/status.rs

@@ -6,7 +6,7 @@ use fn_error_context::context;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    bootc_composefs::boot::BootType,
+    bootc_composefs::{boot::BootType, repo::get_imgref},
     composefs_consts::{COMPOSEFS_CMDLINE, ORIGIN_KEY_BOOT_DIGEST, TYPE1_ENT_PATH, USER_CFG},
     install::EFI_LOADER_INFO,
     parsers::{
@@ -21,7 +21,7 @@ use crate::{
 use std::str::FromStr;
 
 use bootc_utils::try_deserialize_timestamp;
-use cap_std_ext::cap_std::fs::Dir;
+use cap_std_ext::{cap_std::fs::Dir, dirext::CapStdExtDirExt};
 use ostree_container::OstreeImageReference;
 use ostree_ext::container::{self as ostree_container};
 use ostree_ext::containers_image_proxy;
@@ -183,17 +183,29 @@ pub(crate) fn get_bootloader() -> Result<Bootloader> {
 
 /// Reads the .imginfo file for the provided deployment
 #[context("Reading imginfo")]
-pub(crate) fn get_imginfo(storage: &Storage, deployment_id: &str) -> Result<ImgConfigManifest> {
+pub(crate) async fn get_imginfo(
+    storage: &Storage,
+    deployment_id: &str,
+    imgref: &ImageReference,
+) -> Result<ImgConfigManifest> {
     let path = std::path::PathBuf::from(STATE_DIR_RELATIVE)
         .join(deployment_id)
         .join(format!("{deployment_id}.imginfo"));
 
-    let img_conf = storage
+    let mut img_conf = storage
         .physical_root
-        .read_to_string(&path)
+        .open_optional(&path)
         .context("Failed to open file")?;
 
-    let img_conf = serde_json::from_str::<ImgConfigManifest>(&img_conf)
+    let Some(img_conf) = &mut img_conf else {
+        return get_container_manifest_and_config(&get_imgref(&imgref.transport, &imgref.image))
+            .await;
+    };
+
+    let mut buffer = String::new();
+    img_conf.read_to_string(&mut buffer)?;
+
+    let img_conf = serde_json::from_str::<ImgConfigManifest>(&buffer)
         .context("Failed to parse file as JSON")?;
 
     Ok(img_conf)
@@ -210,7 +222,7 @@ async fn boot_entry_from_composefs_deployment(
             let ostree_img_ref = OstreeImageReference::from_str(&img_name_from_config)?;
             let img_ref = ImageReference::from(ostree_img_ref);
 
-            let img_conf = get_imginfo(storage, &verity)?;
+            let img_conf = get_imginfo(storage, &verity, &img_ref).await?;
 
             let image_digest = img_conf.manifest.config().digest().to_string();
             let architecture = img_conf.config.architecture().to_string();

crates/lib/src/bootc_composefs/update.rs

@@ -367,7 +367,8 @@ pub(crate) async fn upgrade_composefs(
     }
 
     if opts.check {
-        let current_manifest = get_imginfo(storage, &*composefs.cmdline.digest)?;
+        let current_manifest =
+            get_imginfo(storage, &*composefs.cmdline.digest, booted_imgref).await?;
         let diff = ManifestDiff::new(&current_manifest.manifest, &img_config.manifest);
         diff.print();
         return Ok(());