composefs-backend/state: Store target imgref

Instead of storing the source imgref in the .origin file, we store the
target imgref

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

Author: Johan-Liebert1

crates/lib/src/bootc_composefs/boot.rs

@@ -33,7 +33,6 @@ use crate::bootc_composefs::status::get_sorted_uki_boot_entries;
 use crate::composefs_consts::{TYPE1_ENT_PATH, TYPE1_ENT_PATH_STAGED};
 use crate::parsers::bls_config::{BLSConfig, BLSConfigType};
 use crate::parsers::grub_menuconfig::MenuEntry;
-use crate::spec::ImageReference;
 use crate::task::Task;
 use crate::{bootc_composefs::repo::open_composefs_repo, store::ComposefsFilesystem};
 use crate::{
@@ -994,11 +993,7 @@ pub(crate) fn setup_composefs_boot(
     write_composefs_state(
         &root_setup.physical_root_path,
         id,
-        &ImageReference {
-            image: state.source.imageref.name.clone(),
-            transport: state.source.imageref.transport.to_string(),
-            signature: None,
-        },
+        &crate::spec::ImageReference::from(state.target_imgref.clone()),
         false,
         boot_type,
         boot_digest,

crates/lib/src/bootc_composefs/state.rs

@@ -113,7 +113,9 @@ pub(crate) fn write_composefs_state(
     boot_type: BootType,
     boot_digest: Option<String>,
 ) -> Result<()> {
-    let state_path = root_path.join(format!("{STATE_DIR_RELATIVE}/{}", deployment_id.to_hex()));
+    let state_path = root_path
+        .join(STATE_DIR_RELATIVE)
+        .join(deployment_id.to_hex());
 
     create_dir_all(state_path.join("etc"))?;