Skip to content

Commit 5979f04

Browse files
install/composefs: Get image and transport source_imgref
Signed-off-by: Pragyan Poudyal <[email protected]>
1 parent 270f7a1 commit 5979f04

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

Cargo.lock

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/src/install.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,10 +1494,13 @@ async fn initialize_composefs_repository(
14941494

14951495
let repo = open_composefs_repo(rootfs_dir)?;
14961496

1497-
let OstreeExtImgRef { transport, name } = &state.target_imgref.imgref;
1497+
let OstreeExtImgRef {
1498+
name: image_name,
1499+
transport,
1500+
} = &state.source.imageref;
14981501

14991502
// transport's display is already of type "<transport_type>:"
1500-
composefs_oci_pull(&Arc::new(repo), &format!("{transport}{name}",), None).await
1503+
composefs_oci_pull(&Arc::new(repo), &format!("{transport}{image_name}",), None).await
15011504
}
15021505

15031506
#[context("Setting up BLS boot")]
@@ -1569,7 +1572,8 @@ menuentry "Fedora Bootc UKI" {{
15691572
search --no-floppy --set=root --fs-uuid {rootfs_uuid}
15701573
chainloader /boot/EFI/Linux/{uki_id}.efi
15711574
}}
1572-
"#, uki_id=id.to_hex()
1575+
"#,
1576+
uki_id = id.to_hex()
15731577
);
15741578

15751579
std::fs::write(boot_dir.join("grub2/user.cfg"), grub_user_config)

0 commit comments

Comments
 (0)